xiongyuxing/gongxue-base
1
0
Fork 0
forked from wangziqi/gongxue-base
Code Pull Requests Activity

feat: DingTalk attendance import + integration config + expense types + UI polish

Browse Source 
Server:
- Add DingTalk attendance import service with SSE progress streaming
- Add IntegrationConfig entity & module for multi-tenant DingTalk setup
- Add ExpenseType entity & ExpenseTypesModule
- Add SeedModule for DB initialization
- Add UserDingMapping entity for DingTalk user linkage
- Attendance service: import flow with dedup & student auto-mapping
- Rooms service: time-range overlap queries
- Sync controller/service: DingTalk integration wiring
- Permission guard: refactor to pure re-export
- Campus scope middleware: tenant-aware filtering

Admin UI:
- Attendance page: import UI with progress & result summary
- All pages: tableStyle/tablePagination standardization
- Login page: responsive styling
- Sensitive data: useViewSensitive hook for masked viewing
- Vite config: path aliases, build optimization
- Test infra: vitest config, test utilities

Docs: PRD DingTalk batch 1 & 2 design docs
This commit is contained in:
wangziqi
2026-07-09 09:11:56 +08:00
parent f1959f0d2a
commit 42d3f0e27f
71 changed files with 5331 additions and 609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/admin/package.json
View File

@@ -6,6 +6,7 @@
"scripts": {
"dev": "vite",
"build": "tsc -b && vite build",
"test": "vitest run",
"lint": "oxlint --config ../../oxlint.config.ts",
"typecheck": "tsc -b --noEmit",
"format": "oxfmt",
@@ -29,7 +30,11 @@
"@types/react": "^19.2.14",
"@types/react-dom": "^19.2.3",
"@vitejs/plugin-react": "^6.0.1",
"@vitest/browser": "^4.1.10",
"@vitest/coverage-v8": "^4.1.10",
"playwright": "^1.61.1",
"typescript": "~6.0.2",
"vite": "^8.0.9"
"vite": "^8.0.9",
"vitest": "^4.1.10"
}
}

160
apps/admin/src/components/StudentProfileContent/index.tsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect, useState, useCallback } from 'react';
import React, { useEffect, useState, useCallback, useMemo } from 'react';
import {
Tabs,
Card,
@@ -20,6 +20,7 @@ import {
Row,
Col,
Statistic,
Spin,
} from 'antd';
import type { ColumnsType } from 'antd/es/table';
import {
@@ -33,6 +34,8 @@ import {
} from '@ant-design/icons';
import dayjs from 'dayjs';
import api from '../../api';
import { maskPhone, maskIdNumber } from '../../utils/sensitive';
import { useViewSensitive } from '../../hooks/useViewSensitive';
// ---- Types ----
@@ -752,16 +755,87 @@ const StudentProfileContent: React.FC<StudentProfileContentProps> = ({
}
}, [studentId]);
if (!aggregateData) return null;
const handleViewSensitive = useViewSensitive(studentId, '学生档案');
const { student, profile, enrollments, examScores, learningRecords, result, attachments } = aggregateData;
const tabItems = useMemo(() => {
if (!aggregateData) return [];
const { profile, enrollments, examScores, learningRecords, result, attachments } = aggregateData;
return [
{
key: 'profile',
label: '扩展档案',
children: <ProfileTab data={profile} studentId={studentId} onRefresh={fetchData} />,
},
{
key: 'enrollments',
label: `报读班型 (${enrollments.length})`,
children: (
<EnrollmentsTab data={enrollments} studentId={studentId} onRefresh={fetchData} />
),
},
{
key: 'exams',
label: `考试成绩 (${examScores.length})`,
children: (
<ExamScoresTab
data={examScores}
studentId={studentId}
enrollments={enrollments}
onRefresh={fetchData}
/>
),
},
{
key: 'attendance',
label: '出勤记录',
children: <Empty description="暂无出勤记录" />,
},
{
key: 'learning',
label: `课堂回访 (${learningRecords.length})`,
children: (
<LearningTab data={learningRecords} studentId={studentId} onRefresh={fetchData} />
),
},
{
key: 'result',
label: '录取归档',
children: <ResultTab data={result} studentId={studentId} onRefresh={fetchData} />,
},
{
key: 'attachments',
label: `附件 (${attachments.length})`,
children: (
<AttachmentsTab data={attachments} studentId={studentId} onRefresh={fetchData} />
),
},
{
key: 'reports',
label: '报告版本',
children: <Empty description="暂无报告版本" />,
},
];
}, [aggregateData, studentId, fetchData]);
if (!aggregateData) {
if (loading) {
return (
<div style={{ textAlign: 'center', padding: 80 }}>
<Spin size="large" />
</div>
);
}
return null;
}
const { student, profile } = aggregateData;
return (
<div>
{inDrawer && (
<Row justify="space-between" align="middle" style={{ marginBottom: 24 }}>
<Space>
<Button type="text" icon={<CloseOutlined />} onClick={onClose} />
<Button type="text" icon={<CloseOutlined />} onClick={onClose} aria-label="关闭档案" />
<span style={{ fontSize: 16, fontWeight: 500 }}>
学员档案 - {student.name} ({student.studentNo})
</span>
@@ -794,8 +868,26 @@ const StudentProfileContent: React.FC<StudentProfileContentProps> = ({
<Descriptions bordered column={3} size="small" style={{ marginBottom: 24 }}>
<Descriptions.Item label="学号">{student.studentNo || '-'}</Descriptions.Item>
<Descriptions.Item label="电话">{student.phone || '-'}</Descriptions.Item>
<Descriptions.Item label="身份证号">{student.idNumber || '-'}</Descriptions.Item>
<Descriptions.Item label="电话">
{student.phone ? (
<span>
<span style={{ marginRight: 8 }}>{maskPhone(student.phone)}</span>
<a onClick={() => handleViewSensitive('电话', student.phone)}>
<EyeOutlined style={{ fontSize: 12, color: '#999' }} />
</a>
</span>
) : '-'}
</Descriptions.Item>
<Descriptions.Item label="身份证号">
{student.idNumber ? (
<span>
<span style={{ marginRight: 8 }}>{maskIdNumber(student.idNumber)}</span>
<a onClick={() => handleViewSensitive('身份证号', student.idNumber)}>
<EyeOutlined style={{ fontSize: 12, color: '#999' }} />
</a>
</span>
) : '-'}
</Descriptions.Item>
<Descriptions.Item label="状态">
<Tag>{student.status || '-'}</Tag>
</Descriptions.Item>
@@ -818,61 +910,7 @@ const StudentProfileContent: React.FC<StudentProfileContentProps> = ({
<Tabs
defaultActiveKey="profile"
items={[
{
key: 'profile',
label: '扩展档案',
children: <ProfileTab data={profile} studentId={studentId} onRefresh={fetchData} />,
},
{
key: 'enrollments',
label: `报读班型 (${enrollments.length})`,
children: (
<EnrollmentsTab data={enrollments} studentId={studentId} onRefresh={fetchData} />
),
},
{
key: 'exams',
label: `考试成绩 (${examScores.length})`,
children: (
<ExamScoresTab
data={examScores}
studentId={studentId}
enrollments={enrollments}
onRefresh={fetchData}
/>
),
},
{
key: 'attendance',
label: '出勤记录',
children: <Empty description="暂无出勤记录" />,
},
{
key: 'learning',
label: `课堂回访 (${learningRecords.length})`,
children: (
<LearningTab data={learningRecords} studentId={studentId} onRefresh={fetchData} />
),
},
{
key: 'result',
label: '录取归档',
children: <ResultTab data={result} studentId={studentId} onRefresh={fetchData} />,
},
{
key: 'attachments',
label: `附件 (${attachments.length})`,
children: (
<AttachmentsTab data={attachments} studentId={studentId} onRefresh={fetchData} />
),
},
{
key: 'reports',
label: '报告版本',
children: <Empty description="暂无报告版本" />,
},
]}
items={tabItems}
/>
</div>
);

43
apps/admin/src/hooks/useViewSensitive.ts Normal file
View File

@@ -0,0 +1,43 @@
import { useCallback } from 'react';
import { Modal, message } from 'antd';
import api from '../api';
/**
* Shared hook for viewing sensitive student info (phone / ID number).
* Logs an audit entry before revealing the unmasked value.
*
* @param studentId - The student whose data is being viewed
* @param module - Audit module label (e.g. '学生管理', '学生档案')
*/
export function useViewSensitive(studentId: number, module: string) {
return useCallback(
(field: string, value: string) => {
Modal.confirm({
title: '查看敏感信息',
content: `您即将查看 "${field}" 的完整信息。此操作将被记录。`,
okText: '确认查看',
cancelText: '取消',
onOk: async () => {
try {
await api.post('/operation-logs/audit', {
module,
action: '查看敏感信息',
targetId: studentId,
targetType: 'student',
detail: `查看${field}`,
});
} catch {
message.error('操作日志记录失败，请稍后重试');
return;
}
Modal.info({
title: field,
content: value,
okText: '关闭',
});
},
});
},
[studentId, module],
);
}

34
apps/admin/src/index.css
View File

@@ -15,9 +15,41 @@ body {
min-height: 100vh;
}
/* === 通用：表格容器横向滚动 === */
/* === 通用：表格容器横向滚动（防双重滚动条） === */
.ant-table-wrapper {
overflow-x: auto;
overflow-y: hidden;
}
/* ── 表格单元格省略号截断（按需启用） ──
在 .ant-table-wrapper 上添加 .table-cell-ellipsis 类即可生效：
<Table className="table-cell-ellipsis" ... /> */
.table-cell-ellipsis .ant-table-thead > tr > th,
.table-cell-ellipsis .ant-table-tbody > tr > td {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
/* 操作列按钮不换行 */
.ant-table-wrapper .ant-table-cell .ant-space {
flex-wrap: nowrap;
}
/* ── 宿舍总览卡片：Tag 溢出截断 ── */
.room-card-tag-wrapper {
overflow: hidden;
}
.room-card-tag-wrapper .ant-tag {
max-width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
display: inline-flex;
align-items: center;
}
.room-card-tag-wrapper .ant-tag .anticon {
flex-shrink: 0;
}
/* === 手机 (< 576px) === */

31
apps/admin/src/layouts/MainLayout.tsx
View File

@@ -1,4 +1,4 @@
import React, { useState } from 'react';
import React, { useCallback, useMemo, useState } from 'react';
import { Outlet, useNavigate, useLocation } from 'react-router-dom';
import { Layout, Menu, Button, Avatar, Dropdown, Drawer, Grid } from 'antd';
import {
@@ -123,7 +123,7 @@ const MainLayout: React.FC = () => {
const [drawerOpen, setDrawerOpen] = useState(false);
const navigate = useNavigate();
const location = useLocation();
const user = JSON.parse(localStorage.getItem('user') || '{}');
const user = useMemo(() => JSON.parse(localStorage.getItem('user') || '{}'), []);
const { hasPermission } = usePermission();
const screens = Grid.useBreakpoint();
@@ -146,19 +146,19 @@ const MainLayout: React.FC = () => {
.filter(Boolean) as MenuItemType[];
};
const menuItems = filterByPermission(allMenuItems);
const menuItems = useMemo(() => filterByPermission(allMenuItems), [hasPermission]);
const handleLogout = () => {
const handleLogout = useCallback(() => {
localStorage.removeItem('token');
localStorage.removeItem('user');
localStorage.removeItem('permissions');
navigate('/login');
};
}, [navigate]);
const handleMenuClick = (key: string) => {
const handleMenuClick = useCallback((key: string) => {
navigate(key);
if (isMobile) setDrawerOpen(false);
};
}, [navigate, isMobile]);
const findSelectedKeys = (items: MenuItemType[], pathname: string): string[] => {
for (const item of items) {
@@ -182,8 +182,8 @@ const MainLayout: React.FC = () => {
return [];
};
const selectedKeys = findSelectedKeys(menuItems, location.pathname);
const openKeys = findOpenKeys(menuItems, location.pathname);
const selectedKeys = useMemo(() => findSelectedKeys(menuItems, location.pathname), [menuItems, location.pathname]);
const openKeys = useMemo(() => findOpenKeys(menuItems, location.pathname), [menuItems, location.pathname]);
const transformToMenuItems = (items: MenuItemType[]): any[] => {
@@ -194,7 +194,7 @@ const MainLayout: React.FC = () => {
children: item.children ? transformToMenuItems(item.children) : undefined,
}));
};
const menuContent = (
const menuContent = useMemo(() => (
<Menu
theme="light"
mode="inline"
@@ -204,7 +204,7 @@ const MainLayout: React.FC = () => {
onClick={({ key }) => handleMenuClick(key)}
style={{ border: 'none' }}
/>
);
), [selectedKeys, openKeys, menuItems, handleMenuClick]);
return (
<Layout style={{ minHeight: '100vh' }}>
@@ -259,6 +259,7 @@ const MainLayout: React.FC = () => {
>
<Button
type="text"
aria-label={isMobile || isTablet ? '打开菜单' : collapsed ? '展开侧边栏' : '收起侧边栏'}
icon={
isMobile || isTablet ? (
<MenuUnfoldOutlined />
@@ -285,7 +286,12 @@ const MainLayout: React.FC = () => {
],
}}
>
<div style={{ cursor: 'pointer', display: 'flex', alignItems: 'center', gap: 8 }}>
<div
role="button"
tabIndex={0}
aria-label="用户菜单"
style={{ cursor: 'pointer', display: 'flex', alignItems: 'center', gap: 8 }}
>
<Avatar icon={<UserOutlined />} />
{isDesktop && <span>{user.name || user.username || '用户'}</span>}
</div>
@@ -298,7 +304,6 @@ const MainLayout: React.FC = () => {
padding: isMobile ? 12 : isTablet ? 16 : 24,
background: '#fff',
borderRadius: 12,
overflow: 'auto',
}}
>
<Outlet />

168
apps/admin/src/pages/Attendance/index.tsx
View File

@@ -8,6 +8,7 @@ import {
CalendarOutlined,
UnorderedListOutlined,
ExportOutlined,
CloudDownloadOutlined,
} from '@ant-design/icons';
import dayjs, { Dayjs } from 'dayjs';
import api from '../../api';
@@ -140,6 +141,12 @@ const AttendancePage: React.FC = () => {
const [dingPageSize, setDingPageSize] = useState(20);
const [dingTotal, setDingTotal] = useState(0);
const [dingMatchStatus, setDingMatchStatus] = useState<string | undefined>(undefined);
// DingTalk import
const [importModalOpen, setImportModalOpen] = useState(false);
const [importDateRange, setImportDateRange] = useState<[Dayjs, Dayjs] | null>(null);
const [importAutoMatch, setImportAutoMatch] = useState(true);
const [importing, setImporting] = useState(false);
const [importProgressMsg, setImportProgressMsg] = useState('');
// Match modal
const [matchModalOpen, setMatchModalOpen] = useState(false);
@@ -261,11 +268,56 @@ const AttendancePage: React.FC = () => {
}
}, [dingPage, dingPageSize, filterClassId, filterDateRange, dingMatchStatus]);
// ── DingTalk import handler ──
const handleImportDingTalk = useCallback(async () => {
if (!importDateRange?.[0] || !importDateRange?.[1]) {
message.warning('请选择导入日期范围');
return;
}
setImporting(true);
setImportProgressMsg('正在从钉钉拉取考勤数据...');
try {
const result = await api.post<{
success: boolean; imported: number; skipped: number; matched: number; errors: string[]; duration: number;
}>('/attendance-records/import/dingtalk', {
start: importDateRange[0].format('YYYY-MM-DD'),
end: importDateRange[1].format('YYYY-MM-DD'),
autoMatch: importAutoMatch,
});
setImportProgressMsg('');
if (result.success) {
message.success(
`导入完成：${result.imported} 条新增, ${result.skipped} 条跳过, ${result.matched} 条匹配 (${result.duration}ms)`,
);
if (result.errors?.length) {
message.warning(`警告：${result.errors.join('; ')}`);
}
setImportModalOpen(false);
fetchDingRecords();
} else {
message.error(`导入失败：${result.errors.join('; ')}`);
}
} catch (e: unknown) {
const err = e as { message?: string };
message.error(err?.message || '导入失败');
} finally {
setImporting(false);
}
}, [importDateRange, importAutoMatch, fetchDingRecords]);
// ── Effects ──
useEffect(() => {
fetchClasses();
}, [fetchClasses]);
useEffect(() => { api.get<AlertItem[]>('/attendance-records/alerts').then(setAlerts).catch(() => {}) }, []);
useEffect(() => {
let cancelled = false;
api.get<AlertItem[]>('/attendance-records/alerts')
.then((data) => { if (!cancelled) setAlerts(data); })
.catch(() => {});
return () => { cancelled = true; };
}, []);
useEffect(() => {
if (calendarView) {
@@ -564,12 +616,44 @@ const AttendancePage: React.FC = () => {
return Array.from(dates).sort();
}, [calendarData]);
const calendarColumns = useMemo(() => [
{
title: '学生',
dataIndex: 'studentName',
key: 'studentName',
width: 100,
fixed: 'left' as const,
},
...calendarDates.map((date) => ({
title: (
<div style={{ textAlign: 'center', fontSize: 12 }}>
<div>{dayjs(date).format('MM/DD')}</div>
<div style={{ color: '#999' }}>{dayjs(date).format('ddd')}</div>
</div>
),
key: date,
width: 80,
render: (_: unknown, record: { studentId: number; studentName: string; days: { date: string; session: string; status: string }[] }) => {
const dayRecord = record.days.find((d) => d.date === date);
if (!dayRecord) return <span style={{ color: '#d9d9d9' }}>-</span>;
const statusInfo = STATUS_MAP[dayRecord.status];
return (
<Tooltip title={`${SESSION_MAP[dayRecord.session] || dayRecord.session}: ${statusInfo?.text || dayRecord.status}`}>
<Tag color={statusInfo?.color || 'default'} style={{ margin: 0, cursor: 'pointer' }}>
{statusInfo?.text || dayRecord.status}
</Tag>
</Tooltip>
);
},
})),
], [calendarDates]);
// ── Render ──
return (
<div>
{alerts.length > 0 && (
<Alert type="warning" showIcon closable
message={`考勤预警：${alerts.length} 名学生异常`}
title={`考勤预警：${alerts.length} 名学生异常`}
description={alerts.map(a => `${a.studentName}(${a.className || '-'})：${a.type} ${a.count}次，最近${a.lastDate}`).join('；')}
style={{ marginBottom: 16 }} />)}
<Tabs
@@ -718,37 +802,7 @@ const AttendancePage: React.FC = () => {
dataSource={calendarData}
pagination={false}
scroll={{ x: Math.max(800, calendarDates.length * 80) }}
columns={[
{
title: '学生',
dataIndex: 'studentName',
key: 'studentName',
width: 100,
fixed: 'left' as const,
},
...calendarDates.map((date) => ({
title: (
<div style={{ textAlign: 'center', fontSize: 12 }}>
<div>{dayjs(date).format('MM/DD')}</div>
<div style={{ color: '#999' }}>{dayjs(date).format('ddd')}</div>
</div>
),
key: date,
width: 80,
render: (_: unknown, record: { studentId: number; studentName: string; days: { date: string; session: string; status: string }[] }) => {
const dayRecord = record.days.find((d) => d.date === date);
if (!dayRecord) return <span style={{ color: '#d9d9d9' }}>-</span>;
const statusInfo = STATUS_MAP[dayRecord.status];
return (
<Tooltip title={`${SESSION_MAP[dayRecord.session] || dayRecord.session}: ${statusInfo?.text || dayRecord.status}`}>
<Tag color={statusInfo?.color || 'default'} style={{ margin: 0, cursor: 'pointer' }}>
{statusInfo?.text || dayRecord.status}
</Tag>
</Tooltip>
);
},
})),
]}
columns={calendarColumns}
/>
)}
</Card>
@@ -803,7 +857,22 @@ const AttendancePage: React.FC = () => {
options={MATCH_STATUS_OPTIONS}
/>
</Col>
<Col>
<Button
type="primary"
icon={<CloudDownloadOutlined />}
loading={importing}
onClick={() => setImportModalOpen(true)}
>
从钉钉拉取考勤
</Button>
</Col>
</Row>
{importing && (
<div style={{ marginTop: 12 }}>
<span style={{ fontSize: 12, color: '#888' }}>{importProgressMsg}</span>
</div>
)}
</Card>
{/* ── DingTalk table ── */}
@@ -925,6 +994,39 @@ const AttendancePage: React.FC = () => {
</Form>
</Modal>
{/* ── DingTalk import modal ── */}
<Modal
title="从钉钉拉取考勤数据"
open={importModalOpen}
onOk={handleImportDingTalk}
onCancel={() => { setImportModalOpen(false); setImportDateRange(null); setImportProgressMsg(''); }}
confirmLoading={importing}
okText="开始拉取"
cancelText="取消"
>
<Form layout="vertical">
<Form.Item label="日期范围" required>
<RangePicker
value={importDateRange}
onChange={(dates) => setImportDateRange(dates as [Dayjs, Dayjs] | null)}
style={{ width: '100%' }}
placeholder={['开始日期', '结束日期']}
/>
</Form.Item>
<Form.Item label="自动匹配">
<Select
value={importAutoMatch ? 'yes' : 'no'}
onChange={(v) => setImportAutoMatch(v === 'yes')}
options={[
{ value: 'yes', label: '是 — 导入后按姓名自动匹配学生' },
{ value: 'no', label: '否 — 仅导入原始数据，稍后手动匹配' },
]}
/>
</Form.Item>
</Form>
</Modal>
{/* ── Edit modal ── */}
<Modal title="编辑考勤" open={editModalOpen} onOk={handleEditSubmit} onCancel={() => setEditModalOpen(false)}>
<Form form={editForm} layout="vertical">

72
apps/admin/src/pages/Bills/index.tsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect, useState, useMemo } from 'react';
import React, { useEffect, useState, useMemo, useCallback } from 'react';
import {
Table,
Modal,
@@ -12,6 +12,7 @@ import {
Input,
Select,
Tooltip,
Spin,
} from 'antd';
import {
FileTextOutlined,
@@ -22,6 +23,7 @@ import {
import dayjs from 'dayjs';
import api from '../../api';
import PermissionButton from '../../components/PermissionButton';
import { downloadBlob } from '../../utils/download';
const { RangePicker } = DatePicker;
@@ -50,8 +52,10 @@ const BillsPage: React.FC = () => {
const [filterStatus, setFilterStatus] = useState<string | undefined>(undefined);
const [filterExpenseType, setFilterExpenseType] = useState<string | undefined>(undefined);
const [generateForm] = Form.useForm();
const [saving, setSaving] = useState(false);
const [detailLoading, setDetailLoading] = useState(false);
const fetchData = async () => {
const fetchData = useCallback(async () => {
setLoading(true);
try {
const params: Record<string, string | undefined> = {};
@@ -63,11 +67,11 @@ const BillsPage: React.FC = () => {
console.error(e);
}
setLoading(false);
};
}, [filterStatus, filterExpenseType]);
useEffect(() => {
fetchData();
}, [filterStatus, filterExpenseType]);
}, [fetchData]);
const filteredBills = useMemo(() => {
return bills.filter((b: any) => {
@@ -83,6 +87,7 @@ const BillsPage: React.FC = () => {
}, [bills, searchText, filterStatus]);
const handleGenerate = async () => {
setSaving(true);
const values = await generateForm.validateFields();
try {
const res: any = await api.post('/bills/generate', {
@@ -95,15 +100,20 @@ const BillsPage: React.FC = () => {
fetchData();
} catch (e: any) {
message.error(e?.message || '生成失败');
} finally {
setSaving(false);
}
};
const showDetail = async (id: number) => {
setDetailLoading(true);
try {
const res = await api.get(`/bills/${id}`);
setDetailModal(res);
} catch (e) {
console.error(e);
} finally {
setDetailLoading(false);
}
};
@@ -155,65 +165,40 @@ const BillsPage: React.FC = () => {
};
const handleExportExcel = () => {
const baseURL = import.meta.env.PROD
? '/api'
: `http://localhost:${import.meta.env.VITE_API_PORT || 3002}/api`;
const token = localStorage.getItem('token');
const url = `${baseURL}/bills/export/excel`;
const a = document.createElement('a');
// 使用 fetch 来携带 token
fetch(url, { headers: { Authorization: `Bearer ${token}` } })
.then((res) => res.blob())
.then((blob) => {
const blobUrl = URL.createObjectURL(blob);
a.href = blobUrl;
a.download = `账单导出_${dayjs().format('YYYYMMDD_HHmmss')}.xlsx`;
a.click();
URL.revokeObjectURL(blobUrl);
message.success('Excel 导出成功');
})
.catch(() => message.error('导出失败'));
downloadBlob('/bills/export/excel', `账单导出_${dayjs().format('YYYYMMDD_HHmmss')}.xlsx`).then(
() => message.success('Excel 导出成功'),
() => message.error('导出失败'),
);
};
const handleExportPdf = (billId: number) => {
const baseURL = import.meta.env.PROD
? '/api'
: `http://localhost:${import.meta.env.VITE_API_PORT || 3002}/api`;
const token = localStorage.getItem('token');
fetch(`${baseURL}/bills/export/pdf/${billId}`, {
headers: { Authorization: `Bearer ${token}` },
})
.then((res) => res.blob())
.then((blob) => {
const url = URL.createObjectURL(blob);
const a = document.createElement('a');
a.href = url;
a.download = `账单_${billId}.pdf`;
a.click();
URL.revokeObjectURL(url);
})
.catch(() => message.error('导出失败'));
downloadBlob(`/bills/export/pdf/${billId}`, `账单_${billId}.pdf`).catch(() =>
message.error('导出失败'),
);
};
const columns = [
const columns = useMemo(() => [
{ title: '学生', width: 120, render: (_: any, r: any) => r.student?.name || '-' },
{ title: '账单周期', width: 200, render: (_: any, r: any) => `${r.periodStart} ~ ${r.periodEnd}` },
{
title: '分摊费用',
dataIndex: 'sharedAmount',
width: 120,
align: 'right' as const,
render: (v: number) => `¥${Number(v).toFixed(2)}`,
},
{
title: '个人费用',
dataIndex: 'personalAmount',
width: 120,
align: 'right' as const,
render: (v: number) => `¥${Number(v).toFixed(2)}`,
},
{
title: '总计',
dataIndex: 'totalAmount',
width: 100,
align: 'right' as const,
render: (v: number) => <strong>¥{Number(v).toFixed(2)}</strong>,
},
{
@@ -308,7 +293,7 @@ const BillsPage: React.FC = () => {
</Space>
),
},
];
], [showDetail, updateStatus, handleDelete, handleExportPdf]);
return (
<div>
@@ -417,6 +402,7 @@ const BillsPage: React.FC = () => {
onOk={handleGenerate}
onCancel={() => setGenerateModal(false)}
okText="生成"
confirmLoading={saving}
>
<Form form={generateForm} layout="vertical">
<Form.Item
@@ -442,7 +428,7 @@ const BillsPage: React.FC = () => {
width={800}
>
{detailModal && (
<>
<Spin spinning={detailLoading}>
<Descriptions bordered size="small" column={2} style={{ marginBottom: 16 }}>
<Descriptions.Item label="学生">{detailModal.student?.name}</Descriptions.Item>
<Descriptions.Item label="状态">
@@ -536,7 +522,7 @@ const BillsPage: React.FC = () => {
},
]}
/>
</>
</Spin>
)}
</Modal>
</div>

9
apps/admin/src/pages/Classes/index.tsx
View File

@@ -75,6 +75,7 @@ const ClassesPage: React.FC = () => {
const [filterStatus, setFilterStatus] = useState<string>();
const [filterType, setFilterType] = useState<string>();
const [form] = Form.useForm<ClassFormValues>();
const [saving, setSaving] = useState(false);
const fetchData = useCallback(async () => {
setLoading(true);
@@ -119,6 +120,7 @@ const ClassesPage: React.FC = () => {
};
const handleSubmit = async () => {
setSaving(true);
try {
const values = await form.validateFields();
const payload = {
@@ -137,6 +139,8 @@ const ClassesPage: React.FC = () => {
fetchData();
} catch (e: any) {
message.error(e?.message || '操作失败');
} finally {
setSaving(false);
}
};
@@ -150,7 +154,7 @@ const ClassesPage: React.FC = () => {
}
};
const columns: ColumnsType<ClassItem> = [
const columns: ColumnsType<ClassItem> = useMemo(() => [
{
title: '班级名称', dataIndex: 'name', width: 120,
sorter: (a, b) => a.name.localeCompare(b.name),
@@ -193,7 +197,7 @@ const ClassesPage: React.FC = () => {
</Space>
),
},
];
], []);
return (
<Card>
@@ -239,6 +243,7 @@ const ClassesPage: React.FC = () => {
open={modalOpen}
onOk={handleSubmit}
onCancel={() => setModalOpen(false)}
confirmLoading={saving}
width={600}
>
<Form form={form} layout="vertical">

42
apps/admin/src/pages/ClassroomRentals/index.tsx
View File

@@ -18,6 +18,7 @@ import {
import { PlusOutlined, UploadOutlined, DeleteOutlined, FileTextOutlined } from '@ant-design/icons';
import dayjs, { Dayjs } from 'dayjs';
import api from '../../api';
import { downloadBlob } from '../../utils/download';
import PermissionButton from '../../components/PermissionButton';
const ClassroomRentalsPage: React.FC = () => {
@@ -30,6 +31,7 @@ const ClassroomRentalsPage: React.FC = () => {
const [form] = Form.useForm();
const [filterMonth, setFilterMonth] = useState<Dayjs | null>(null);
const [searchText, setSearchText] = useState('');
const [saving, setSaving] = useState(false);
const filteredData = useMemo(() => {
if (!searchText) return data;
@@ -73,6 +75,7 @@ const ClassroomRentalsPage: React.FC = () => {
const handleSave = async () => {
const values = await form.validateFields();
setSaving(true);
const payload = {
classroomId: values.classroomId,
tenantId: values.tenantId,
@@ -103,6 +106,8 @@ const ClassroomRentalsPage: React.FC = () => {
} else {
message.error(e?.message || '操作失败');
}
} finally {
setSaving(false);
}
};
@@ -116,27 +121,15 @@ const ClassroomRentalsPage: React.FC = () => {
}
};
const handleDownloadContract = (id: number, filename?: string) => {
const baseURL = import.meta.env.PROD
? '/api'
: `http://localhost:${import.meta.env.VITE_API_PORT || 3002}/api`;
const token = localStorage.getItem('token');
fetch(`${baseURL}/classroom-rentals/${id}/contract`, {
headers: { Authorization: `Bearer ${token}` },
})
.then((res) => {
if (!res.ok) throw new Error('下载失败');
return res.blob();
})
.then((blob) => {
const url = URL.createObjectURL(blob);
const a = document.createElement('a');
a.href = url;
a.download = filename || `contract-${id}.pdf`;
a.click();
URL.revokeObjectURL(url);
})
.catch(() => message.error('下载失败（可能文件已丢失）'));
const handleDownloadContract = async (id: number, filename?: string) => {
try {
await downloadBlob(
`/classroom-rentals/${id}/contract`,
filename || `contract-${id}.pdf`,
);
} catch {
message.error('下载失败（可能文件已丢失）');
}
};
const handleDeleteContract = async (id: number) => {
@@ -162,7 +155,7 @@ const ClassroomRentalsPage: React.FC = () => {
setModalOpen(true);
};
const columns = [
const columns = useMemo(() => [
{
title: '教室', width: 120,
dataIndex: 'classroom',
@@ -215,7 +208,7 @@ const ClassroomRentalsPage: React.FC = () => {
</Button>
</Tooltip>
<Popconfirm title="删除合同文件？" onConfirm={() => handleDeleteContract(r.id)}>
<Button size="small" danger icon={<DeleteOutlined />} />
<Button size="small" danger icon={<DeleteOutlined />} aria-label="删除合同文件" />
</Popconfirm>
</Space>
) : (
@@ -268,7 +261,7 @@ const ClassroomRentalsPage: React.FC = () => {
</Space>
),
},
];
], []);
return (
<div>
@@ -330,6 +323,7 @@ const ClassroomRentalsPage: React.FC = () => {
setModalOpen(false);
setEditing(null);
}}
confirmLoading={saving}
okText="保存"
width={600}
>

43
apps/admin/src/pages/ClassroomSchedule/index.tsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect, useState, useMemo } from 'react';
import React, { useEffect, useState, useMemo, useCallback } from 'react';
import {
DatePicker,
Card,
@@ -16,6 +16,7 @@ import {
import { CalendarOutlined, FileTextOutlined } from '@ant-design/icons';
import dayjs, { Dayjs } from 'dayjs';
import api from '../../api';
import { downloadBlob } from '../../utils/download';
interface ScheduleData {
year: number;
@@ -36,7 +37,7 @@ const ClassroomSchedulePage: React.FC = () => {
const [data, setData] = useState<ScheduleData | null>(null);
const [detailModal, setDetailModal] = useState<any>(null);
const fetchData = async () => {
const fetchData = useCallback(async () => {
setLoading(true);
try {
const res: any = await api.get('/classroom-rentals/schedule', {
@@ -47,11 +48,11 @@ const ClassroomSchedulePage: React.FC = () => {
console.error(e);
}
setLoading(false);
};
}, [month]);
useEffect(() => {
fetchData();
}, [month]);
}, [fetchData]);
// 按楼栋+楼层分组教室
const groups = useMemo(() => {
@@ -89,23 +90,15 @@ const ClassroomSchedulePage: React.FC = () => {
}
};
const handleDownloadContract = (id: number, filename?: string) => {
const baseURL = import.meta.env.PROD
? '/api'
: `http://localhost:${import.meta.env.VITE_API_PORT || 3002}/api`;
const token = localStorage.getItem('token');
fetch(`${baseURL}/classroom-rentals/${id}/contract`, {
headers: { Authorization: `Bearer ${token}` },
})
.then((res) => res.blob())
.then((blob) => {
const url = URL.createObjectURL(blob);
const a = document.createElement('a');
a.href = url;
a.download = filename || `contract-${id}.pdf`;
a.click();
URL.revokeObjectURL(url);
});
const handleDownloadContract = async (id: number, filename?: string) => {
try {
await downloadBlob(
`/classroom-rentals/${id}/contract`,
filename || `contract-${id}.pdf`,
);
} catch {
// downloadBlob already shows an error via throw
}
};
return (
@@ -164,8 +157,10 @@ const ClassroomSchedulePage: React.FC = () => {
title="整体占用率"
value={overall.rate}
suffix="%"
valueStyle={{
color: overall.rate > 70 ? '#cf1322' : overall.rate > 40 ? '#fa8c16' : '#3f8600',
styles={{
value: {
color: overall.rate > 70 ? '#cf1322' : overall.rate > 40 ? '#fa8c16' : '#3f8600',
},
}}
/>
</Card>
@@ -202,7 +197,7 @@ const ClassroomSchedulePage: React.FC = () => {
size="small"
title={group.name}
style={{ marginBottom: 12 }}
bodyStyle={{ padding: 0 }}
styles={{ body: { padding: 0 } }}
>
<table style={{ width: '100%', borderCollapse: 'collapse', fontSize: 12 }}>
<thead>

10
apps/admin/src/pages/Classrooms/index.tsx
View File

@@ -55,6 +55,8 @@ const ClassroomsPage: React.FC = () => {
const [searchText, setSearchText] = useState('');
const [filterStatus, setFilterStatus] = useState<string | undefined>(undefined);
const [saving, setSaving] = useState(false);
const filteredData = useMemo(() => {
let result = data;
if (searchText) { const s = searchText.toLowerCase(); result = result.filter((d: Record<string, unknown>) => (typeof d.name === 'string' && d.name.toLowerCase().includes(s)) || (typeof d.building === 'string' && d.building.toLowerCase().includes(s))); }
@@ -79,6 +81,7 @@ const ClassroomsPage: React.FC = () => {
const handleSave = async () => {
const values = await form.validateFields();
setSaving(true);
try {
if (editing) {
await api.put(`/classrooms/${editing.id}`, values);
@@ -93,6 +96,8 @@ const ClassroomsPage: React.FC = () => {
fetchData();
} catch (e: any) {
message.error(e?.message || '操作失败');
} finally {
setSaving(false);
}
};
@@ -134,7 +139,7 @@ const ClassroomsPage: React.FC = () => {
.catch(() => message.error('下载失败'));
};
const columns = [
const columns = useMemo(() => [
{
title: '教室名', width: 120,
dataIndex: 'name',
@@ -201,7 +206,7 @@ const ClassroomsPage: React.FC = () => {
</Space>
),
},
];
], []);
return (
<div>
@@ -293,6 +298,7 @@ const ClassroomsPage: React.FC = () => {
setModalOpen(false);
setEditing(null);
}}
confirmLoading={saving}
okText="保存"
>
<Form form={form} layout="vertical">

61
apps/admin/src/pages/Dashboard/index.tsx
View File

@@ -1,5 +1,5 @@
import React, { useEffect, useState } from 'react';
import { Row, Col, Card, Statistic, DatePicker, Spin, Grid } from 'antd';
import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { Row, Col, Card, Statistic, DatePicker, Spin, Grid, message } from 'antd';
import { TeamOutlined, HomeOutlined, CheckCircleOutlined, BankOutlined, PercentageOutlined, UserSwitchOutlined, SolutionOutlined, FileProtectOutlined, ReadOutlined, CalendarOutlined } from '@ant-design/icons';
import ReactECharts from 'echarts-for-react';
import dayjs from 'dayjs';
@@ -62,6 +62,17 @@ interface DashboardStats {
incomeTrend: IncomeTrendRow[];
}
const attendanceLabelMap: Record<string, string> = {
present: '出勤',
absent: '缺勤',
late: '迟到',
early: '早退',
leave: '请假',
};
const SECTION_ROW_STYLE: React.CSSProperties = { marginBottom: 24 };
const MARGIN_BOTTOM_16_STYLE: React.CSSProperties = { marginBottom: 16 };
const DashboardPage: React.FC = () => {
const screens = Grid.useBreakpoint();
const isMobile = !screens.sm;
@@ -77,7 +88,7 @@ const DashboardPage: React.FC = () => {
dayjs().endOf('month').format('YYYY-MM-DD'),
]);
const fetchData = async () => {
const fetchData = useCallback(async () => {
setLoading(true);
try {
const [s, rr, cr, g] = await Promise.all([
@@ -100,13 +111,14 @@ const DashboardPage: React.FC = () => {
setClassroomUtil(cu);
} catch (e) {
console.error(e);
message.error('数据加载失败，请稍后重试');
}
setLoading(false);
};
}, [period]);
useEffect(() => {
fetchData();
}, [period]);
}, [fetchData, period]);
const [expenseTypeMap, setExpenseTypeMap] = useState<Record<string, string>>({});
@@ -118,16 +130,8 @@ const DashboardPage: React.FC = () => {
}).catch(() => {});
}, []);
const attendanceLabelMap: Record<string, string> = {
present: '出勤',
absent: '缺勤',
late: '迟到',
early: '早退',
leave: '请假',
};
// 今日出勤状态分布环图
const attendanceRingOption = {
const attendanceRingOption = useMemo(() => ({
tooltip: { trigger: 'item' },
legend: { bottom: 0 },
series: [
@@ -143,11 +147,11 @@ const DashboardPage: React.FC = () => {
},
],
color: COLORS,
};
}), [stats?.attendanceByStatus]);
// 宿舍费用排行
const barOption = {
const barOption = useMemo(() => ({
tooltip: {},
grid: { left: 80, right: 20, bottom: 30, top: 10 },
xAxis: { type: 'value' },
@@ -163,7 +167,7 @@ const DashboardPage: React.FC = () => {
itemStyle: { color: '#007AFF', borderRadius: [0, 4, 4, 0] },
},
],
};
}), [roomRanking]);
// 班级考勤排行 - 前5
const classRankingTopOption = {
@@ -249,7 +253,7 @@ const DashboardPage: React.FC = () => {
};
// 入住时间线（甘特图）
const ganttOption = {
const ganttOption = useMemo(() => ({
tooltip: {
formatter: (p: { data: { name: string; value: [string, string, string, boolean] } }) =>
`${p.data.name}<br/>入住: ${p.data.value[1]}<br/>退宿: ${p.data.value[2]}`,
@@ -300,7 +304,7 @@ const DashboardPage: React.FC = () => {
}))
),
}],
};
}), [ganttData]);
if (loading && !stats)
return <Spin size="large" style={{ display: 'block', margin: '100px auto' }} />;
@@ -319,6 +323,7 @@ const DashboardPage: React.FC = () => {
>
<h2 style={{ margin: 0 }}>数据面板</h2>
<RangePicker
aria-label="选择日期范围"
value={[dayjs(period[0]), dayjs(period[1])]}
onChange={(dates) => {
if (dates) setPeriod([dates[0]!.format('YYYY-MM-DD'), dates[1]!.format('YYYY-MM-DD')]);
@@ -326,7 +331,7 @@ const DashboardPage: React.FC = () => {
/>
</div>
<Row gutter={[16, 16]} style={{ marginBottom: 24 }}>
<Row gutter={[16, 16]} style={SECTION_ROW_STYLE}>
<Col xs={12} sm={12} md={6}>
<Card>
<Statistic title="宿舍总数" value={stats?.totalRooms || 0} prefix={<HomeOutlined />} />
@@ -363,7 +368,7 @@ const DashboardPage: React.FC = () => {
</Col>
</Row>
<Row gutter={[16, 16]} style={{ marginBottom: 24 }}>
<Row gutter={[16, 16]} style={SECTION_ROW_STYLE}>
<Col xs={12} sm={12} md={6}>
<Card>
<Statistic title="教室总数" value={stats?.classroomCount || 0} prefix={<BankOutlined />} />
@@ -401,7 +406,7 @@ const DashboardPage: React.FC = () => {
</Col>
</Row>
<Row gutter={[16, 16]} style={{ marginBottom: 24 }}>
<Row gutter={[16, 16]} style={SECTION_ROW_STYLE}>
<Col xs={12} sm={12} md={6}>
<Card>
<Statistic title="班级总数" value={stats?.classCount ?? 0} prefix={<TeamOutlined />} />
@@ -439,7 +444,7 @@ const DashboardPage: React.FC = () => {
</Col>
</Row>
<Card title="教室利用率" style={{ marginBottom: 16 }}>
<Card title="教室利用率" style={MARGIN_BOTTOM_16_STYLE}>
<Row gutter={[24, 16]}>
<Col xs={12} sm={6}>
<Statistic title="教室总数" value={classroomUtil?.totalClassrooms ?? '-'} prefix={<ReadOutlined />} />
@@ -453,7 +458,7 @@ const DashboardPage: React.FC = () => {
value={classroomUtil?.utilizationRate ?? '-'}
suffix="%"
prefix={<PercentageOutlined />}
valueStyle={{ color: Number(classroomUtil?.utilizationRate ?? 0) > 70 ? '#34C759' : '#FF9500' }}
styles={{ value: { color: Number(classroomUtil?.utilizationRate ?? 0) > 70 ? '#34C759' : '#FF9500' } }}
/>
</Col>
<Col xs={12} sm={6}>
@@ -462,7 +467,7 @@ const DashboardPage: React.FC = () => {
</Row>
</Card>
<Row gutter={[16, 16]} style={{ marginBottom: 24 }}>
<Row gutter={[16, 16]} style={SECTION_ROW_STYLE}>
<Col xs={24} sm={12}>
<Card title="考勤趋势（近30天）">
{(stats?.attendanceTrend || []).length > 0 ? (
@@ -483,7 +488,7 @@ const DashboardPage: React.FC = () => {
</Col>
</Row>
<Row gutter={[16, 16]} style={{ marginBottom: 24 }}>
<Row gutter={[16, 16]} style={SECTION_ROW_STYLE}>
<Col xs={24} sm={12}>
<Card title="班级出勤率 TOP 5">
{classRanking.top.length > 0 ? (
@@ -504,7 +509,7 @@ const DashboardPage: React.FC = () => {
</Col>
</Row>
<Row gutter={[16, 16]} style={{ marginBottom: 24 }}>
<Row gutter={[16, 16]} style={SECTION_ROW_STYLE}>
<Col xs={24}>
<Card title="教室占用热力图">
{classroomOccupancy.length > 0 ? (
@@ -533,7 +538,7 @@ const DashboardPage: React.FC = () => {
</Col>
</Row>
<Row gutter={[16, 16]} style={{ marginBottom: 24 }}>
<Row gutter={[16, 16]} style={SECTION_ROW_STYLE}>
<Col xs={24} sm={12}>
<Card title="费用类型分布">
{((stats?.expenseByType) ?? []).length > 0 ? (

17
apps/admin/src/pages/Departments/index.tsx
View File

@@ -82,6 +82,7 @@ const DepartmentsPage: React.FC = () => {
const [modalOpen, setModalOpen] = useState(false);
const [editing, setEditing] = useState<DepartmentItem | null>(null);
const [form] = Form.useForm();
const [saving, setSaving] = useState(false);
const fetchTree = useCallback(async () => {
setTreeLoading(true);
@@ -160,6 +161,7 @@ const DepartmentsPage: React.FC = () => {
}, [selectedDept, form]);
const handleSubmit = useCallback(async () => {
setSaving(true);
try {
const values = await form.validateFields();
const payload = {
@@ -180,8 +182,18 @@ const DepartmentsPage: React.FC = () => {
if (editing && selectedId) {
fetchDetail(editing.id);
}
} catch {
// form validation error: do nothing
} catch (err: unknown) {
if (
err &&
typeof err === 'object' &&
'message' in err &&
typeof (err as { message: string }).message === 'string'
) {
message.error((err as { message: string }).message);
}
// form validation error falls through silently
} finally {
setSaving(false);
}
}, [editing, fetchTree, fetchDetail, selectedId, form]);
@@ -367,6 +379,7 @@ const DepartmentsPage: React.FC = () => {
onOk={handleSubmit}
onCancel={() => setModalOpen(false)}
destroyOnHidden
confirmLoading={saving}
>
<Form form={form} layout="vertical">
<Form.Item

38
apps/admin/src/pages/Deposits/index.tsx
View File

@@ -18,6 +18,7 @@ import {
import { PlusOutlined, DeleteOutlined, DollarOutlined, CheckOutlined } from '@ant-design/icons';
import dayjs from 'dayjs';
import api from '../../api';
import { maskPhone, maskIdNumber } from '../../utils/sensitive';
import PermissionButton from '../../components/PermissionButton';
const statusMap: Record<string, { text: string; color: string }> = {
@@ -66,6 +67,7 @@ const DepositsPage: React.FC = () => {
const [searchText, setSearchText] = useState('');
const [filterStatus, setFilterStatus] = useState<string | undefined>(undefined);
const [activeTab, setActiveTab] = useState<string>('all');
const [saving, setSaving] = useState(false);
const fetchData = async () => {
setLoading(true);
@@ -105,7 +107,19 @@ const DepositsPage: React.FC = () => {
});
}, [data, searchText, filterStatus]);
const studentOptions = useMemo(
() =>
students
.filter((s: any) => s.status === 'active')
.map((s: any) => ({
value: s.id,
label: `${s.name} (${s.idNumber ? maskIdNumber(s.idNumber) : (s.phone ? maskPhone(s.phone) : '')})`,
})),
[students],
);
const handleCreate = async () => {
setSaving(true);
const values = await createForm.validateFields();
try {
await api.post('/deposits', {
@@ -120,10 +134,13 @@ const DepositsPage: React.FC = () => {
fetchData();
} catch (e: any) {
message.error(e?.message || '操作失败');
} finally {
setSaving(false);
}
};
const handleRefund = async () => {
setSaving(true);
const values = await refundForm.validateFields();
try {
await api.put(`/deposits/${refundModal.id}/refund`, {
@@ -138,6 +155,8 @@ const DepositsPage: React.FC = () => {
fetchData();
} catch (e: any) {
message.error(e?.message || '操作失败');
} finally {
setSaving(false);
}
};
@@ -165,6 +184,7 @@ const DepositsPage: React.FC = () => {
const handleRejectRefund = async () => {
if (!rejectModal) return;
setSaving(true);
try {
await api.put(`/deposits/${rejectModal.id}/reject-refund`, { reason: rejectReason || '未说明原因' });
message.success('已驳回退款申请');
@@ -174,6 +194,8 @@ const DepositsPage: React.FC = () => {
fetchData();
} catch (e: any) {
message.error(e?.message || '驳回失败');
} finally {
setSaving(false);
}
};
const handleAddInstallment = async () => {
@@ -216,7 +238,7 @@ const DepositsPage: React.FC = () => {
}
};
const columns = [
const columns = useMemo(() => [
{ title: '学生', width: 120, render: (_: any, r: any) => r.student?.name || '-' },
{ title: '押金金额', dataIndex: 'amount', width: 110, render: (v: number) => `¥${Number(v).toFixed(2)}` },
{ title: '缴纳日期', dataIndex: 'paidDate', width: 110 },
@@ -304,7 +326,7 @@ const DepositsPage: React.FC = () => {
</Space>
),
},
];
], [handleRequestRefund, fetchData]);
const pendingColumns = [
{ title: '学生', width: 120, render: (_: any, r: any) => r.student?.name || '-' },
@@ -444,6 +466,7 @@ const DepositsPage: React.FC = () => {
onOk={handleCreate}
onCancel={() => setCreateModal(false)}
okText="确认"
confirmLoading={saving}
>
<Form form={createForm} layout="vertical">
<Form.Item
@@ -455,12 +478,7 @@ const DepositsPage: React.FC = () => {
showSearch
optionFilterProp="label"
placeholder="搜索并选择学生"
options={students
.filter((s: any) => s.status === 'active')
.map((s: any) => ({
value: s.id,
label: `${s.name} (${s.idNumber || s.phone || ''})`,
}))}
options={studentOptions}
/>
</Form.Item>
<Form.Item name="amount" label="押金金额（元）" rules={[{ required: true }]}>
@@ -482,6 +500,7 @@ const DepositsPage: React.FC = () => {
onOk={handleRefund}
onCancel={() => setRefundModal(null)}
okText="确认退还"
confirmLoading={saving}
>
<Form form={refundForm} layout="vertical">
<div style={{ marginBottom: 16, padding: 12, background: '#f5f5f5', borderRadius: 8 }}>
@@ -624,9 +643,10 @@ const DepositsPage: React.FC = () => {
onCancel={() => { setRejectModal(null); setRejectReason(''); }}
okText="确认驳回"
okButtonProps={{ danger: true }}
confirmLoading={saving}
>
<Input.TextArea
placeholder="请输入驳回原因"
aria-label="驳回原因"
value={rejectReason}
onChange={(e) => setRejectReason(e.target.value)}
rows={3}

90
apps/admin/src/pages/Expenses/index.tsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect, useState, useMemo } from 'react';
import React, { useEffect, useState, useMemo, useCallback } from 'react';
import {
Table,
Button,
@@ -26,6 +26,7 @@ import {
import dayjs from 'dayjs';
import api from '../../api';
import PermissionButton from '../../components/PermissionButton';
import { downloadBlob } from '../../utils/download';
const { RangePicker } = DatePicker;
@@ -49,6 +50,7 @@ const ExpensesPage: React.FC = () => {
const [personalTypeFilter, setPersonalTypeFilter] = useState<string | undefined>(undefined);
const [selectedRoomKeys, setSelectedRoomKeys] = useState<number[]>([]);
const [selectedPersonalKeys, setSelectedPersonalKeys] = useState<number[]>([]);
const [saving, setSaving] = useState(false);
// Dynamic expense type options from API
const [typeOptions, setTypeOptions] = useState<{ value: string; label: string }[]>([]);
@@ -99,7 +101,7 @@ const ExpensesPage: React.FC = () => {
}
};
const fetchData = async () => {
const fetchData = useCallback(async () => {
setLoading(true);
try {
const [re, pe, rm, st]: any[] = await Promise.all([
@@ -116,11 +118,11 @@ const ExpensesPage: React.FC = () => {
console.error(e);
}
setLoading(false);
};
}, []);
useEffect(() => {
fetchData();
}, []);
}, [fetchData]);
const filteredRoomExpenses = useMemo(() => {
return roomExpenses.filter((r: any) => {
@@ -145,6 +147,7 @@ const ExpensesPage: React.FC = () => {
}, [personalExpenses, personalSearch, personalTypeFilter]);
const handleRoomExpense = async () => {
setSaving(true);
const values = await roomForm.validateFields();
const payload = {
roomId: values.roomId,
@@ -168,10 +171,13 @@ const ExpensesPage: React.FC = () => {
fetchData();
} catch (e: any) {
message.error(e?.message || '操作失败');
} finally {
setSaving(false);
}
};
const handlePersonalExpense = async () => {
setSaving(true);
const values = await personalForm.validateFields();
const payload = {
studentId: values.studentId,
@@ -195,10 +201,12 @@ const ExpensesPage: React.FC = () => {
fetchData();
} catch (e: any) {
message.error(e?.message || '操作失败');
} finally {
setSaving(false);
}
};
const roomColumns = [
const roomColumns = useMemo(() => [
{ title: '宿舍', width: 120, render: (_: any, r: any) => r.room?.roomNumber || '-' },
{
title: '费用类型', width: 100,
@@ -256,9 +264,9 @@ const ExpensesPage: React.FC = () => {
</Space>
),
},
];
], [setEditingRoom, roomForm, setRoomModal, fetchData, typeMap]);
const personalColumns = [
const personalColumns = useMemo(() => [
{ title: '学生', width: 120, render: (_: any, r: any) => r.student?.name || '-' },
{
title: '费用类型', width: 100,
@@ -312,7 +320,7 @@ const ExpensesPage: React.FC = () => {
</Space>
),
},
];
], [setEditingPersonal, personalForm, setPersonalModal, fetchData, typeMap]);
return (
<div>
@@ -357,9 +365,7 @@ const ExpensesPage: React.FC = () => {
const formData = new FormData();
formData.append('file', file);
try {
const res: any = await api.post('/expenses/utility/import', formData, {
headers: { 'Content-Type': 'multipart/form-data' },
});
const res: any = await api.post('/expenses/utility/import', formData);
if (res.errors?.length > 0) {
Modal.warning({
title: res.message,
@@ -383,23 +389,9 @@ const ExpensesPage: React.FC = () => {
permission="expense:view"
icon={<DownloadOutlined />}
onClick={() => {
const baseURL = import.meta.env.PROD
? '/api'
: `http://localhost:${import.meta.env.VITE_API_PORT || 3002}/api`;
const token = localStorage.getItem('token');
fetch(`${baseURL}/expenses/utility/template`, {
headers: { Authorization: `Bearer ${token}` },
})
.then((res) => res.blob())
.then((blob) => {
const url = URL.createObjectURL(blob);
const a = document.createElement('a');
a.href = url;
a.download = '水电费导入模板.xlsx';
a.click();
URL.revokeObjectURL(url);
})
.catch(() => message.error('下载失败'));
downloadBlob('/expenses/utility/template', '水电费导入模板.xlsx').catch(() =>
message.error('下载失败'),
);
}}
>
下载水电费模板
@@ -508,23 +500,9 @@ const ExpensesPage: React.FC = () => {
permission="expense:view"
icon={<DownloadOutlined />}
onClick={() => {
const baseURL = import.meta.env.PROD
? '/api'
: `http://localhost:${import.meta.env.VITE_API_PORT || 3002}/api`;
const token = localStorage.getItem('token');
fetch(`${baseURL}/expenses/personal/template`, {
headers: { Authorization: `Bearer ${token}` },
})
.then((res) => res.blob())
.then((blob) => {
const url = URL.createObjectURL(blob);
const a = document.createElement('a');
a.href = url;
a.download = '个人附加费导入模板.xlsx';
a.click();
URL.revokeObjectURL(url);
})
.catch(() => message.error('下载失败'));
downloadBlob('/expenses/personal/template', '个人附加费导入模板.xlsx').catch(
() => message.error('下载失败'),
);
}}
>
下载模板
@@ -533,23 +511,9 @@ const ExpensesPage: React.FC = () => {
permission="expense:view"
icon={<ExportOutlined />}
onClick={() => {
const baseURL = import.meta.env.PROD
? '/api'
: `http://localhost:${import.meta.env.VITE_API_PORT || 3002}/api`;
const token = localStorage.getItem('token');
fetch(`${baseURL}/expenses/personal/export`, {
headers: { Authorization: `Bearer ${token}` },
})
.then((res) => res.blob())
.then((blob) => {
const url = URL.createObjectURL(blob);
const a = document.createElement('a');
a.href = url;
a.download = '个人附加费导出.xlsx';
a.click();
URL.revokeObjectURL(url);
})
.catch(() => message.error('导出失败'));
downloadBlob('/expenses/personal/export', '个人附加费导出.xlsx').catch(() =>
message.error('导出失败'),
);
}}
>
导出
@@ -613,6 +577,7 @@ const ExpensesPage: React.FC = () => {
setEditingRoom(null);
}}
okText={editingRoom ? '保存' : '确认录入'}
confirmLoading={saving}
>
<Form form={roomForm} layout="vertical">
<Form.Item name="roomId" label="宿舍" rules={[{ required: true }]}>
@@ -653,6 +618,7 @@ const ExpensesPage: React.FC = () => {
setEditingPersonal(null);
}}
okText={editingPersonal ? '保存' : '确认录入'}
confirmLoading={saving}
>
<Form form={personalForm} layout="vertical">
<Form.Item name="studentId" label="学生" rules={[{ required: true }]}>

10
apps/admin/src/pages/Login/index.tsx
View File

@@ -1,4 +1,4 @@
import React, { useState } from 'react';
import React, { useCallback, useState } from 'react';
import { useNavigate } from 'react-router-dom';
import { Form, Input, Button, Card, message, Typography } from 'antd';
import { UserOutlined, LockOutlined } from '@ant-design/icons';
@@ -10,7 +10,7 @@ const LoginPage: React.FC = () => {
const [loading, setLoading] = useState(false);
const navigate = useNavigate();
const onFinish = async (values: any) => {
const onFinish = useCallback(async (values: any) => {
setLoading(true);
try {
const res: any = await api.post('/auth/login', values);
@@ -24,7 +24,7 @@ const LoginPage: React.FC = () => {
} finally {
setLoading(false);
}
};
}, [navigate]);
return (
<div
@@ -52,10 +52,10 @@ const LoginPage: React.FC = () => {
<p style={{ color: '#86868b', marginTop: 8 }}>水电费精准计费平台</p>
</div>
<Form name="login" onFinish={onFinish} size="large">
<Form.Item name="username" rules={[{ required: true, message: '请输入用户名' }]}>
<Form.Item label="用户名" name="username" rules={[{ required: true, message: '请输入用户名' }]}>
<Input prefix={<UserOutlined />} placeholder="用户名" />
</Form.Item>
<Form.Item name="password" rules={[{ required: true, message: '请输入密码' }]}>
<Form.Item label="密码" name="password" rules={[{ required: true, message: '请输入密码' }]}>
<Input.Password prefix={<LockOutlined />} placeholder="密码" />
</Form.Item>
<Form.Item>

26
apps/admin/src/pages/Notifications/index.tsx
View File

@@ -1,5 +1,5 @@
import React, { useState, useEffect } from 'react';
import { List, Typography, Menu, Layout, Button, Empty, Spin, Space } from 'antd';
import { List, Typography, Menu, Layout, Button, Empty, Spin, Space, message } from 'antd';
import {
BellOutlined,
DollarOutlined,
@@ -57,7 +57,10 @@ const NotificationsPage: React.FC = () => {
try {
const data = await api.get('/notifications?limit=50') as unknown as NotificationItem[];
setNotifications(data);
} catch { /* ignore */ }
} catch (e: any) {
console.error('加载通知失败', e);
message.error(e?.message || '加载通知失败');
}
setLoading(false);
};
@@ -72,7 +75,10 @@ const NotificationsPage: React.FC = () => {
setNotifications((prev) =>
prev.map((n) => (n.id === item.id ? { ...n, isRead: true } : n)),
);
} catch { /* ignore */ }
} catch (e: any) {
console.error('标记已读失败', e);
message.error(e?.message || '标记已读失败');
}
}
if (item.link) navigate(item.link);
};
@@ -83,7 +89,10 @@ const NotificationsPage: React.FC = () => {
setNotifications((prev) =>
prev.map((n) => ({ ...n, isRead: true })),
);
} catch { /* ignore */ }
} catch (e: any) {
console.error('全部已读失败', e);
message.error(e?.message || '操作失败');
}
};
const filtered = filter === 'all'
@@ -121,7 +130,16 @@ const NotificationsPage: React.FC = () => {
const meta = typeMap[item.type] || { label: item.type, icon: <BellOutlined /> };
return (
<List.Item
role="button"
tabIndex={0}
aria-label={`通知: ${item.title}`}
onClick={() => handleClick(item)}
onKeyDown={(e) => {
if (e.key === 'Enter' || e.key === ' ') {
e.preventDefault();
handleClick(item);
}
}}
style={{
cursor: 'pointer',
padding: '16px 0',

114
apps/admin/src/pages/Occupancies/index.tsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect, useState, useMemo } from 'react';
import React, { useEffect, useState, useMemo, useCallback } from 'react';
import {
Table,
Button,
@@ -28,6 +28,8 @@ import {
} from '@ant-design/icons';
import dayjs from 'dayjs';
import api from '../../api';
import { downloadBlob } from '../../utils/download';
import { maskPhone, maskIdNumber } from '../../utils/sensitive';
import PermissionButton from '../../components/PermissionButton';
const { RangePicker } = DatePicker;
@@ -47,34 +49,42 @@ const OccupanciesPage: React.FC = () => {
const [dateRange, setDateRange] = useState<[dayjs.Dayjs | null, dayjs.Dayjs | null] | null>(null);
const [batchCheckOutModal, setBatchCheckOutModal] = useState(false);
const [selectedRowKeys, setSelectedRowKeys] = useState<number[]>([]);
const [saving, setSaving] = useState(false);
const [checkInForm] = Form.useForm();
const [checkOutForm] = Form.useForm();
const [transferForm] = Form.useForm();
const [batchCheckOutForm] = Form.useForm();
const fetchData = async () => {
const fetchData = useCallback(async () => {
setLoading(true);
try {
const [occ, stu, rm, tn]: any[] = await Promise.all([
const [occRes, stuRes, rmRes, tnRes] = (await Promise.allSettled([
api.get('/occupancies', { params: { active: showActive ? 'true' : undefined, dateFrom: dateRange?.[0]?.format('YYYY-MM-DD'), dateTo: dateRange?.[1]?.format('YYYY-MM-DD') } }),
api.get('/students'),
api.get('/rooms/overview'),
api.get('/tenants'),
]);
setData(occ);
setStudents(stu);
setRooms(rm);
setTenants(tn);
])) as PromiseSettledResult<any>[];
const labels = ['入住数据', '学生列表', '房间列表', '租赁方'];
[occRes, stuRes, rmRes, tnRes].forEach((res, i) => {
if (res.status === 'rejected') {
message.warning(`${labels[i]}加载失败`);
}
});
setData(occRes.status === 'fulfilled' ? occRes.value : []);
setStudents(stuRes.status === 'fulfilled' ? stuRes.value : []);
setRooms(rmRes.status === 'fulfilled' ? rmRes.value : []);
setTenants(tnRes.status === 'fulfilled' ? tnRes.value : []);
} catch (e) {
console.error(e);
message.error('数据加载异常');
}
setLoading(false);
};
}, [showActive, dateRange]);
useEffect(() => {
fetchData();
setSelectedRowKeys([]);
}, [showActive, dateRange]);
}, [fetchData]);
const filteredData = useMemo(() => {
if (!searchText) return data;
@@ -88,6 +98,7 @@ const OccupanciesPage: React.FC = () => {
const handleCheckIn = async () => {
const values = await checkInForm.validateFields();
setSaving(true);
try {
await api.post('/occupancies/check-in', {
studentId: values.studentId,
@@ -104,11 +115,14 @@ const OccupanciesPage: React.FC = () => {
fetchData();
} catch (e: any) {
message.error(e?.message || '操作失败');
} finally {
setSaving(false);
}
};
const handleCheckOut = async () => {
const values = await checkOutForm.validateFields();
setSaving(true);
try {
await api.put(`/occupancies/${checkOutModal.id}/check-out`, {
checkOutDate: values.checkOutDate.format('YYYY-MM-DD'),
@@ -121,11 +135,14 @@ const OccupanciesPage: React.FC = () => {
fetchData();
} catch (e: any) {
message.error(e?.message || '操作失败');
} finally {
setSaving(false);
}
};
const handleTransfer = async () => {
const values = await transferForm.validateFields();
setSaving(true);
try {
await api.put(`/occupancies/${transferModal.id}/transfer`, {
newRoomId: values.newRoomId,
@@ -140,6 +157,8 @@ const OccupanciesPage: React.FC = () => {
fetchData();
} catch (e: any) {
message.error(e?.message || '操作失败');
} finally {
setSaving(false);
}
};
@@ -173,7 +192,7 @@ const OccupanciesPage: React.FC = () => {
}
};
const columns = [
const columns = useMemo(() => [
{ title: '学生', width: 120, render: (_: any, r: any) => r.student?.name || '-' },
{ title: '宿舍', width: 120, render: (_: any, r: any) => r.room?.roomNumber || '-' },
{ title: '入住日期', dataIndex: 'checkInDate', width: 110 },
@@ -237,19 +256,19 @@ const OccupanciesPage: React.FC = () => {
</Space>
),
},
];
], [fetchData, setCheckOutModal, checkOutForm, setTransferModal, transferForm]);
const rowSelection = {
const rowSelection = useMemo(() => ({
selectedRowKeys,
onChange: (keys: any[]) => setSelectedRowKeys(keys),
// 「在住记录」Tab：禁用已退宿（防止误选用于批量退宿）；「全部记录」Tab：均可选用于批量删除
getCheckboxProps: (record: any) => (showActive ? { disabled: !!record.checkOutDate } : {}),
};
}), [selectedRowKeys, showActive]);
return (
<div>
<Alert
message="一站式导入"
title="一站式导入"
description="导入入住名单时会自动创建学生和宿舍，无需单独在「学生管理」或「宿舍管理」中手动添加。后续仅需在此页面处理换房/退宿等日常操作即可。"
type="info"
showIcon
@@ -337,23 +356,9 @@ const OccupanciesPage: React.FC = () => {
permission="occupancy:view"
icon={<DownloadOutlined />}
onClick={() => {
const baseURL = import.meta.env.PROD
? '/api'
: `http://localhost:${import.meta.env.VITE_API_PORT || 3002}/api`;
const token = localStorage.getItem('token');
fetch(`${baseURL}/occupancies/template`, {
headers: { Authorization: `Bearer ${token}` },
})
.then((res) => res.blob())
.then((blob) => {
const url = URL.createObjectURL(blob);
const a = document.createElement('a');
a.href = url;
a.download = '入住名单导入模板.xlsx';
a.click();
URL.revokeObjectURL(url);
})
.catch(() => message.error('下载失败'));
downloadBlob('/occupancies/template', '入住名单导入模板.xlsx').catch(() =>
message.error('下载失败'),
);
}}
>
下载模板
@@ -362,24 +367,11 @@ const OccupanciesPage: React.FC = () => {
permission="occupancy:view"
icon={<ExportOutlined />}
onClick={() => {
const baseURL = import.meta.env.PROD
? '/api'
: `http://localhost:${import.meta.env.VITE_API_PORT || 3002}/api`;
const token = localStorage.getItem('token');
const params = showActive ? '?active=true' : '';
fetch(`${baseURL}/occupancies/export${params}`, {
headers: { Authorization: `Bearer ${token}` },
})
.then((res) => res.blob())
.then((blob) => {
const url = URL.createObjectURL(blob);
const a = document.createElement('a');
a.href = url;
a.download = showActive ? '在住记录.xlsx' : '全部入住记录.xlsx';
a.click();
URL.revokeObjectURL(url);
})
.catch(() => message.error('导出失败'));
const filename = showActive ? '在住记录.xlsx' : '全部入住记录.xlsx';
downloadBlob('/occupancies/export' + params, filename).catch(() =>
message.error('导出失败'),
);
}}
>
导出记录
@@ -388,21 +380,34 @@ const OccupanciesPage: React.FC = () => {
<Switch size="small" checked={autoDeposit} onChange={setAutoDeposit} />
导入时自动收押金
{autoDeposit && (
<Space.Compact>
<InputNumber
size="small"
min={0}
value={depositAmount}
onChange={(v) => setDepositAmount(v || 500)}
style={{ width: 80 }}
addonAfter="元"
style={{ width: 60 }}
/>
<span
style={{
padding: '0 8px',
display: 'flex',
alignItems: 'center',
border: '1px solid #d9d9d9',
backgroundColor: '#fafafa',
fontSize: 12,
}}
>
元
</span>
</Space.Compact>
)}
</span>
</Space>
</div>
{selectedRowKeys.length > 0 && (
<Alert
message={
title={
<span>
已选 <strong>{selectedRowKeys.length}</strong> 条记录
{showActive ? (
@@ -464,6 +469,7 @@ const OccupanciesPage: React.FC = () => {
onOk={handleCheckIn}
onCancel={() => setCheckInModal(false)}
okText="确认入住"
confirmLoading={saving}
width={500}
>
<Form form={checkInForm} layout="vertical">
@@ -480,7 +486,7 @@ const OccupanciesPage: React.FC = () => {
.filter((s: any) => s.status === 'active')
.map((s: any) => ({
value: s.id,
label: `${s.name} (${s.idNumber || s.phone || ''})`,
label: `${s.name} (${s.idNumber ? maskIdNumber(s.idNumber) : (s.phone ? maskPhone(s.phone) : '')})`,
}))}
/>
</Form.Item>
@@ -549,6 +555,7 @@ const OccupanciesPage: React.FC = () => {
onOk={handleCheckOut}
onCancel={() => setCheckOutModal(null)}
okText="确认退宿"
confirmLoading={saving}
>
<Form form={checkOutForm} layout="vertical">
<Form.Item name="checkOutDate" label="退宿日期" rules={[{ required: true }]}>
@@ -636,6 +643,7 @@ const OccupanciesPage: React.FC = () => {
onOk={handleTransfer}
onCancel={() => setTransferModal(null)}
okText="确认换房"
confirmLoading={saving}
width={500}
>
<Form form={transferForm} layout="vertical">

12
apps/admin/src/pages/OperationLogs/index.tsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect, useState } from 'react';
import React, { useEffect, useState, useMemo, useCallback } from 'react';
import { Table, Select, DatePicker, Space, Tag, Tooltip } from 'antd';
import dayjs from 'dayjs';
import api from '../../api';
@@ -28,7 +28,7 @@ const OperationLogsPage: React.FC = () => {
const [filterModule, setFilterModule] = useState<string | undefined>();
const [dateRange, setDateRange] = useState<[string, string] | null>(null);
const fetchData = async () => {
const fetchData = useCallback(async () => {
setLoading(true);
try {
const params: any = { page, pageSize: 20 };
@@ -44,13 +44,13 @@ const OperationLogsPage: React.FC = () => {
console.error(e);
}
setLoading(false);
};
}, [page, filterModule, dateRange]);
useEffect(() => {
fetchData();
}, [page, filterModule, dateRange]);
}, [fetchData]);
const columns = [
const columns = useMemo(() => [
{
title: '时间',
dataIndex: 'createdAt',
@@ -106,7 +106,7 @@ const OperationLogsPage: React.FC = () => {
);
},
},
];
], []);
return (
<div>

4
apps/admin/src/pages/Permissions/index.tsx
View File

@@ -1,5 +1,5 @@
import React, { useEffect, useState } from 'react';
import { Card, Tag, Input, Space, Spin } from 'antd';
import { Card, Tag, Input, Space, Spin, Empty } from 'antd';
import api from '../../api';
interface PermissionItem {
@@ -68,6 +68,7 @@ const PermissionsPage: React.FC = () => {
<h2 style={{ margin: 0 }}>权限一览</h2>
<Input.Search
placeholder="搜索权限名称或编码"
aria-label="搜索权限名称或编码"
allowClear
style={{ width: 280 }}
onSearch={setSearch}
@@ -97,6 +98,7 @@ const PermissionsPage: React.FC = () => {
</Space>
</Card>
))}
{filteredTree.length === 0 && <Empty description="未找到匹配的权限" />}
</Space>
</div>
);

17
apps/admin/src/pages/Roles/index.tsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect, useState } from 'react';
import React, { useEffect, useState, useMemo, useCallback } from 'react';
import {
Table,
Modal,
@@ -39,8 +39,9 @@ const RolesPage: React.FC = () => {
const [allPerms, setAllPerms] = useState<{ group: string; permissions: PermissionItem[] }[]>([]);
const [form] = Form.useForm();
const [selectedPermIds, setSelectedPermIds] = useState<number[]>([]);
const [saving, setSaving] = useState(false);
const fetchData = async () => {
const fetchData = useCallback(async () => {
setLoading(true);
try {
const [roles, permTree] = await Promise.all([
@@ -55,11 +56,11 @@ const RolesPage: React.FC = () => {
console.error(e);
}
setLoading(false);
};
}, []);
useEffect(() => {
fetchData();
}, []);
}, [fetchData]);
const handleAdd = () => {
setEditing(null);
@@ -76,6 +77,7 @@ const RolesPage: React.FC = () => {
};
const handleSubmit = async () => {
setSaving(true);
const values = await form.validateFields();
try {
if (editing) {
@@ -97,6 +99,8 @@ const RolesPage: React.FC = () => {
fetchData();
} catch (e: any) {
message.error(e.message || '操作失败');
} finally {
setSaving(false);
}
};
@@ -126,7 +130,7 @@ const RolesPage: React.FC = () => {
role: '角色管理',
};
const columns = [
const columns = useMemo(() => [
{ title: 'ID', dataIndex: 'id', width: 80 },
{ title: '名称', dataIndex: 'name', width: 120 },
{ title: '描述', dataIndex: 'description', width: 200 },
@@ -172,7 +176,7 @@ const RolesPage: React.FC = () => {
</Space>
),
},
];
], []);
const handleGroupCheckAll = (group: string, checked: boolean) => {
const groupPermIds =
@@ -235,6 +239,7 @@ const RolesPage: React.FC = () => {
onCancel={() => setModalOpen(false)}
width={700}
destroyOnHidden
confirmLoading={saving}
>
<Form form={form} layout="vertical">
<Form.Item

179
apps/admin/src/pages/RoomVisual/index.tsx
View File

@@ -1,36 +1,86 @@
import React, { useEffect, useState } from 'react';
import { Row, Col, Card, Tag, Select, Statistic, Modal, Spin, Badge, Tooltip } from 'antd';
import { HomeOutlined, UserOutlined, CalendarOutlined, BankOutlined } from '@ant-design/icons';
import React, { useEffect, useState, useCallback } from 'react';
import { Row, Col, Card, Tag, Select, Statistic, Modal, Spin, Badge, Tooltip, DatePicker, Alert, Button } from 'antd';
import { HomeOutlined, UserOutlined, CalendarOutlined, BankOutlined, HistoryOutlined, ShopOutlined } from '@ant-design/icons';
import dayjs, { Dayjs } from 'dayjs';
import api from '../../api';
function getCardStyle(room: any): React.CSSProperties {
let base: React.CSSProperties;
if (room.status === 'maintenance') base = { background: '#f5f5f5', borderColor: '#d9d9d9' };
else if (room.currentCount === 0) base = { background: '#f6ffed', borderColor: '#b7eb8f' };
else if (room.currentCount >= room.capacity) base = { background: '#fff2f0', borderColor: '#ffccc7' };
else base = { background: '#e6f4ff', borderColor: '#91caff' };
if (room.tenantColor) {
return { ...base, background: `color-mix(in srgb, ${room.tenantColor} 15%, ${base.background || '#fff'} 85%)` };
}
return base;
}
function getStatusLabel(room: any) {
if (room.status === 'maintenance') return <Tag color="default">维修中</Tag>;
if (room.currentCount === 0) return <Tag color="success">空闲</Tag>;
if (room.currentCount >= room.capacity) return <Tag color="error">满员</Tag>;
return <Tag color="processing">部分入住</Tag>;
}
function getTenantTags(occupants: any[]) {
const tenantList = [
...new Map(
occupants
.filter((o: any) => o.tenantName)
.map((o: any) => [o.tenantId, { name: o.tenantName, color: o.tenantColor }]),
).values(),
] as { name: string; color: string | null }[];
if (tenantList.length === 0) return null;
return (
<div className="room-card-tag-wrapper" style={{ marginBottom: 6 }}>
{tenantList.map((t) => (
<Tag
key={t.name}
color={t.color || 'gold'}
style={{ fontSize: 12, marginBottom: 4, maxWidth: '100%' }}
icon={<ShopOutlined />}
>
{t.name}
</Tag>
))}
</div>
);
}
const RoomVisualPage: React.FC = () => {
const [data, setData] = useState<any>(null);
const [loading, setLoading] = useState(true);
const [selectedBuilding, setSelectedBuilding] = useState<string>('all');
const [selectedTenant, setSelectedTenant] = useState<number | 'all'>('all');
const [detailRoom, setDetailRoom] = useState<any>(null);
const [asOf, setAsOf] = useState<Dayjs | null>(null);
const fetchData = async () => {
const isHistorical = !!asOf && !asOf.isSame(dayjs(), 'day');
const fetchData = useCallback(async () => {
setLoading(true);
try {
const res: any = await api.get('/rooms/visual');
const params = isHistorical ? { asOf: asOf!.format('YYYY-MM-DD') } : undefined;
const res: any = await api.get('/rooms/visual', { params });
setData(res);
} catch (e) {
console.error(e);
}
setLoading(false);
};
}, [isHistorical, asOf]);
useEffect(() => {
fetchData();
}, []);
}, [fetchData]);
if (loading || !data)
return <Spin size="large" style={{ display: 'block', margin: '100px auto' }} />;
if (!data) return <Spin size="large" style={{ display: 'block', margin: '100px auto' }} />;
const rooms =
selectedBuilding === 'all'
? data.rooms
: data.rooms.filter((r: any) => r.building === selectedBuilding);
const rooms = data.rooms.filter((r: any) => {
if (selectedBuilding !== 'all' && r.building !== selectedBuilding) return false;
if (selectedTenant !== 'all' && !(r.tenantIds || []).includes(selectedTenant)) return false;
return true;
});
const totalRooms = rooms.length;
const emptyRooms = rooms.filter(
@@ -43,24 +93,7 @@ const RoomVisualPage: React.FC = () => {
);
const fullRooms = rooms.filter((r: any) => r.currentCount >= r.capacity).length;
const getCardStyle = (room: any): React.CSSProperties => {
let base: React.CSSProperties;
if (room.status === 'maintenance') base = { background: '#f5f5f5', borderColor: '#d9d9d9' };
else if (room.currentCount === 0) base = { background: '#f6ffed', borderColor: '#b7eb8f' };
else if (room.currentCount >= room.capacity) base = { background: '#fff2f0', borderColor: '#ffccc7' };
else base = { background: '#e6f4ff', borderColor: '#91caff' };
if (room.tenantColor) {
return { ...base, background: `color-mix(in srgb, ${room.tenantColor} 15%, ${base.background || '#fff'} 85%)` };
}
return base;
};
const getStatusLabel = (room: any) => {
if (room.status === 'maintenance') return <Tag color="default">维修中</Tag>;
if (room.currentCount === 0) return <Tag color="success">空闲</Tag>;
if (room.currentCount >= room.capacity) return <Tag color="error">满员</Tag>;
return <Tag color="processing">部分入住</Tag>;
};
/* getCardStyle, getStatusLabel, getTenantTags are now standalone functions outside the component */
return (
<div>
@@ -75,17 +108,64 @@ const RoomVisualPage: React.FC = () => {
}}
>
<h2 style={{ margin: 0 }}>宿舍总览</h2>
<Select
value={selectedBuilding}
onChange={setSelectedBuilding}
style={{ width: 160 }}
options={[
{ value: 'all', label: '全部楼栋' },
...data.buildings.map((b: string) => ({ value: b, label: b })),
]}
/>
<div style={{ display: 'flex', alignItems: 'center', gap: 12, flexWrap: 'wrap' }}>
<DatePicker
value={asOf}
onChange={setAsOf}
allowClear
placeholder="查看历史日期"
suffixIcon={<HistoryOutlined />}
disabledDate={(d) => d && d.isAfter(dayjs(), 'day')}
style={{ width: 180 }}
/>
<Select
value={selectedBuilding}
onChange={setSelectedBuilding}
style={{ width: 160 }}
options={[
{ value: 'all', label: '全部楼栋' },
...data.buildings.map((b: string) => ({ value: b, label: b })),
]}
/>
<Select
value={selectedTenant}
onChange={setSelectedTenant}
style={{ width: 180 }}
options={[
{ value: 'all', label: '全部租赁方' },
...(data.tenants || []).map((t: any) => ({
value: t.id,
label: (
<span style={{ display: 'inline-flex', alignItems: 'center', gap: 6 }}>
{t.color && (
<span style={{ width: 8, height: 8, borderRadius: '50%', backgroundColor: t.color, display: 'inline-block' }} />
)}
{t.name}
</span>
),
})),
]}
/>
</div>
</div>
{isHistorical && (
<Alert
type="warning"
showIcon
icon={<HistoryOutlined />}
style={{ marginBottom: 16 }}
title={`正在查看 ${asOf!.format('YYYY年M月D日')} 的历史入住情况（含当日已归档房间），非实时数据`}
action={
<Button size="small" type="link" onClick={() => setAsOf(null)}>
返回今天
</Button>
}
/>
)}
{loading && <Spin style={{ display: 'block', margin: '8px auto 16px' }} />}
{/* 统计栏 */}
<Row gutter={[12, 12]} style={{ marginBottom: 20 }}>
<Col xs={12} sm={6}>
@@ -95,17 +175,17 @@ const RoomVisualPage: React.FC = () => {
</Col>
<Col xs={12} sm={6}>
<Card size="small">
<Statistic title="空闲房间" value={emptyRooms} valueStyle={{ color: '#34C759' }} />
<Statistic title="空闲房间" value={emptyRooms} styles={{ value: { color: '#34C759' } }} />
</Card>
</Col>
<Col xs={12} sm={6}>
<Card size="small">
<Statistic title="可安排床位" value={availableBeds} valueStyle={{ color: '#007AFF' }} />
<Statistic title="可安排床位" value={availableBeds} styles={{ value: { color: '#007AFF' } }} />
</Card>
</Col>
<Col xs={12} sm={6}>
<Card size="small">
<Statistic title="满员房间" value={fullRooms} valueStyle={{ color: '#FF3B30' }} />
<Statistic title="满员房间" value={fullRooms} styles={{ value: { color: '#FF3B30' } }} />
</Card>
</Col>
</Row>
@@ -161,22 +241,23 @@ const RoomVisualPage: React.FC = () => {
: room.currentCount > 0
? '#007AFF'
: '#34C759',
fontSize: 11,
fontSize: 12,
}}
/>
</div>
{room.orgLabel && (
<div style={{ marginBottom: 6 }}>
<Tag color="purple" style={{ fontSize: 11 }} icon={<BankOutlined />}>
<div className="room-card-tag-wrapper" style={{ marginBottom: 6 }}>
<Tag color="purple" style={{ fontSize: 12 }} icon={<BankOutlined />}>
{room.orgLabel}
</Tag>
</div>
)}
{getTenantTags(room.occupants)}
{room.occupants.length > 0 && (
<div style={{ borderTop: '1px solid rgba(0,0,0,0.06)', paddingTop: 6 }}>
<div className="room-card-tag-wrapper" style={{ borderTop: '1px solid rgba(0,0,0,0.06)', paddingTop: 6 }}>
{room.occupants.slice(0, 4).map((o: any) => (
<Tooltip key={o.studentId} title={`入住 ${o.days} 天 (${o.checkInDate} 起)`}>
<Tag style={{ margin: '0 4px 4px 0', fontSize: 11 }} icon={<UserOutlined />}>
<Tag style={{ margin: '0 4px 4px 0', fontSize: 12, maxWidth: '100%' }} icon={<UserOutlined />}>
{o.studentName}
</Tag>
</Tooltip>
@@ -241,7 +322,7 @@ const RoomVisualPage: React.FC = () => {
<UserOutlined style={{ marginRight: 6 }} />
<strong>{o.studentName}</strong>
{o.organization && (
<Tag color="purple" style={{ marginLeft: 6, fontSize: 11 }}>
<Tag color="purple" style={{ marginLeft: 6, fontSize: 12 }}>
{o.organization}
</Tag>
)}

75
apps/admin/src/pages/Rooms/index.tsx
View File

@@ -26,6 +26,7 @@ import {
DeleteOutlined,
} from '@ant-design/icons';
import api from '../../api';
import { downloadBlob } from '../../utils/download';
import PermissionButton from '../../components/PermissionButton';
const statusMap: Record<string, { text: string; color: string }> = {
@@ -35,6 +36,31 @@ const statusMap: Record<string, { text: string; color: string }> = {
archived: { text: '已归档', color: '#999' },
};
function parseRoomNumber(input: string) {
const cleaned = input.replace(/[（(].*?[）)]/g, '').trim();
const familyMatch = cleaned.match(/^(\d+)-(\d+)-(\d+)$/);
if (familyMatch) {
return {
building: `${familyMatch[1]}-${familyMatch[2]}栋`,
floor: parseInt(familyMatch[3].charAt(0), 10) || undefined,
roomType: '家庭房',
capacity: 4,
};
}
const stdMatch = cleaned.match(/^(\d+)-(\d+)$/);
if (stdMatch) {
const bldgNum = stdMatch[1];
const roomPart = stdMatch[2];
const floor = parseInt(roomPart.charAt(0), 10) || undefined;
let roomType = '四人间';
let capacity = 4;
if (bldgNum === '2') { roomType = '单人间'; capacity = 1; }
else if (bldgNum === '8') { roomType = '爆改房'; capacity = 2; }
return { building: `${bldgNum}号楼`, floor, roomType, capacity };
}
return null;
}
const RoomsPage: React.FC = () => {
const [data, setData] = useState<any[]>([]);
const [loading, setLoading] = useState(false);
@@ -47,6 +73,7 @@ const RoomsPage: React.FC = () => {
const [filterBuilding, setFilterBuilding] = useState<string | undefined>(undefined);
const [filterStatus, setFilterStatus] = useState<string | undefined>(undefined);
const [selectedRowKeys, setSelectedRowKeys] = useState<number[]>([]);
const [saving, setSaving] = useState(false);
const [form] = Form.useForm();
const handleBatchDelete = async () => {
@@ -99,6 +126,7 @@ const RoomsPage: React.FC = () => {
const handleSave = async () => {
const values = await form.validateFields();
setSaving(true);
try {
if (editing) {
await api.put(`/rooms/${editing.id}`, values);
@@ -113,6 +141,8 @@ const RoomsPage: React.FC = () => {
fetchData();
} catch (e: any) {
message.error(e?.message || '操作失败');
} finally {
setSaving(false);
}
};
@@ -146,43 +176,15 @@ const RoomsPage: React.FC = () => {
};
const handleDownloadTemplate = () => {
const baseURL = import.meta.env.PROD
? '/api'
: `http://localhost:${import.meta.env.VITE_API_PORT || 3002}/api`;
const token = localStorage.getItem('token');
fetch(`${baseURL}/rooms/template`, { headers: { Authorization: `Bearer ${token}` } })
.then((res) => res.blob())
.then((blob) => {
const url = URL.createObjectURL(blob);
const a = document.createElement('a');
a.href = url;
a.download = '宿舍导入模板.xlsx';
a.click();
URL.revokeObjectURL(url);
})
.catch(() => message.error('下载失败'));
downloadBlob('/rooms/template', '房间导入模板.xlsx').catch(() => message.error('下载失败'));
};
const handleExport = () => {
const baseURL = import.meta.env.PROD
? '/api'
: `http://localhost:${import.meta.env.VITE_API_PORT || 3002}/api`;
const token = localStorage.getItem('token');
const params = showArchived ? '?includeArchived=true' : '';
fetch(`${baseURL}/rooms/export${params}`, { headers: { Authorization: `Bearer ${token}` } })
.then((res) => res.blob())
.then((blob) => {
const url = URL.createObjectURL(blob);
const a = document.createElement('a');
a.href = url;
a.download = '宿舍列表.xlsx';
a.click();
URL.revokeObjectURL(url);
})
.catch(() => message.error('导出失败'));
downloadBlob('/rooms/export' + params, '房间列表.xlsx').catch(() => message.error('导出失败'));
};
const columns = [
const columns = useMemo(() => [
{
title: '房间号',
dataIndex: 'roomNumber',
@@ -288,7 +290,7 @@ const RoomsPage: React.FC = () => {
</Space>
),
},
];
], [showArchived, buildings, handleBatchDelete, handleRestore, handleArchive, showDetail]);
return (
<div>
@@ -416,10 +418,17 @@ const RoomsPage: React.FC = () => {
setEditing(null);
}}
okText="保存"
confirmLoading={saving}
>
<Form form={form} layout="vertical">
<Form.Item name="roomNumber" label="房间号" rules={[{ required: true }]}>
<Input placeholder="如：4-102（自动解析楼栋楼层）" />
<Input
placeholder="如：4-102（自动解析楼栋楼层）"
onChange={(e) => {
const parsed = parseRoomNumber(e.target.value);
if (parsed) form.setFieldsValue(parsed);
}}
/>
</Form.Item>
<Form.Item name="building" label="楼栋">
<Input placeholder="如：4号楼（留空自动解析）" />

18
apps/admin/src/pages/Schedules/index.tsx
View File

@@ -509,7 +509,16 @@ const SchedulesPage: React.FC = () => {
return (
<td
key={wd}
tabIndex={0}
role="button"
aria-label={`选择教室 ${classroom.name} ${WEEKDAYS[wd - 1]} 排课`}
onClick={() => handleCellClick(classroom.id, wd)}
onKeyDown={(e) => {
if (e.key === 'Enter' || e.key === ' ') {
e.preventDefault();
handleCellClick(classroom.id, wd);
}
}}
style={{
padding: 4,
border: '1px solid #f0f0f0',
@@ -610,7 +619,16 @@ const SchedulesPage: React.FC = () => {
return (
<td
key={di}
tabIndex={0}
role="button"
aria-label={`${day.format('YYYY-MM-DD')} 排课详情`}
onClick={() => handleDateClick(day)}
onKeyDown={(e) => {
if (e.key === 'Enter' || e.key === ' ') {
e.preventDefault();
handleDateClick(day);
}
}}
style={{
padding: '6px 8px',
border: '1px solid #f0f0f0',

6
apps/admin/src/pages/StudentProfile/index.tsx
View File

@@ -1,4 +1,4 @@
import React from 'react';
import React, { useCallback } from 'react';
import { useParams, useNavigate } from 'react-router-dom';
import { Card, Button, Space } from 'antd';
import { ArrowLeftOutlined, EyeOutlined } from '@ant-design/icons';
@@ -14,7 +14,7 @@ const StudentProfilePage: React.FC = () => {
const studentId = Number(id);
const handlePreviewReport = async () => {
const handlePreviewReport = useCallback(async () => {
try {
const { html } = await api.get<{ html: string }>(`/archive/${studentId}/report-html`);
const w = window.open('', '_blank');
@@ -25,7 +25,7 @@ const StudentProfilePage: React.FC = () => {
} catch (err) {
console.error('Failed to load report HTML:', err);
}
};
}, [studentId]);
return (
<Card

78
apps/admin/src/pages/Students/index.tsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect, useState } from 'react';
import React, { useEffect, useState, useMemo, useCallback } from 'react';
import {
Table,
Button,
@@ -31,16 +31,7 @@ import {
import api from '../../api';
import PermissionButton from '../../components/PermissionButton';
import StudentProfileContent from '../../components/StudentProfileContent';
const maskPhone = (phone: string) => {
if (!phone || phone.length < 7) return phone || '-';
return phone.slice(0, 3) + '****' + phone.slice(-4);
};
const maskIdNumber = (id: string) => {
if (!id || id.length < 8) return id || '-';
return id.slice(0, 3) + '***********' + id.slice(-4);
};
import { maskPhone, maskIdNumber } from '../../utils/sensitive';
const statusMap: Record<string, { text: string; color: string }> = {
active: { text: '在读', color: 'green' },
@@ -85,6 +76,7 @@ const StudentsPage: React.FC = () => {
const [drawerOpen, setDrawerOpen] = useState(false);
const [drawerStudentId, setDrawerStudentId] = useState<number | undefined>(undefined);
const [form] = Form.useForm();
const [saving, setSaving] = useState(false);
const openDrawer = (studentId: number) => {
setDrawerStudentId(studentId);
@@ -98,18 +90,22 @@ const StudentsPage: React.FC = () => {
okText: '确认查看',
cancelText: '取消',
onOk: async () => {
api.post('/operation-logs/audit', {
module: '学生管理',
action: '查看敏感信息',
targetId: studentId,
targetType: 'student',
detail: `查看${field}`,
}).catch(() => {});
modal.info({
title: field,
content: value,
okText: '关闭',
});
try {
await api.post('/operation-logs/audit', {
module: '学生管理',
action: '查看敏感信息',
targetId: studentId,
targetType: 'student',
detail: `查看${field}`,
});
modal.info({
title: field,
content: value,
okText: '关闭',
});
} catch {
message.error('审计日志记录失败，请稍后重试');
}
},
});
};
@@ -125,7 +121,7 @@ const StudentsPage: React.FC = () => {
}
};
const fetchData = async () => {
const fetchData = useCallback(async () => {
setLoading(true);
try {
const params: Record<string, unknown> = { name: searchName || undefined, includeArchived: 'true' };
@@ -140,11 +136,11 @@ const StudentsPage: React.FC = () => {
console.error(e);
}
setLoading(false);
};
}, [searchName, showArchived, filterStatus, filterTenantId]);
useEffect(() => {
fetchData();
}, [searchName, showArchived, filterStatus, filterTenantId]);
}, [fetchData]);
useEffect(() => {
api.get('/tenants', { params: { includeArchived: 'false' } }).then((res: unknown) => {
@@ -153,6 +149,7 @@ const StudentsPage: React.FC = () => {
}, []);
const handleSave = async () => {
const values = await form.validateFields();
setSaving(true);
try {
if (editing) {
await api.put(`/students/${editing.id}`, values);
@@ -167,6 +164,8 @@ const StudentsPage: React.FC = () => {
fetchData();
} catch (e: any) {
message.error(e?.message || '操作失败');
} finally {
setSaving(false);
}
};
@@ -227,14 +226,14 @@ const StudentsPage: React.FC = () => {
.catch(() => message.error('导出失败'));
};
const columns = [
const columns = useMemo(() => [
{ title: 'ID', dataIndex: 'id', width: 70 },
{
title: '姓名',
dataIndex: 'name',
width: 120,
render: (v: string, record: any) => (
<a onClick={() => openDrawer(record.id)}>{v}</a>
<Button type="link" size="small" onClick={() => openDrawer(record.id)}>{v}</Button>
),
},
{
@@ -246,16 +245,16 @@ const StudentsPage: React.FC = () => {
return (
<span>
<span style={{ marginRight: 4 }}>{maskPhone(v)}</span>
<a onClick={() => handleViewSensitive(record.id, '电话', v)} title="点击查看完整号码">
<Button type="link" size="small" style={{ padding: '8px 4px' }} onClick={() => handleViewSensitive(record.id, '电话', v)} title="点击查看完整号码">
<EyeOutlined style={{ fontSize: 12, color: '#999' }} />
</a>
</Button>
</span>
);
},
},
{
title: '学号',
dataIndex: 'studentNumber',
dataIndex: 'studentNo',
width: 120,
render: (v: string) => v || '-',
},
@@ -268,9 +267,9 @@ const StudentsPage: React.FC = () => {
return (
<span>
<span style={{ marginRight: 4 }}>{maskIdNumber(v)}</span>
<a onClick={() => handleViewSensitive(record.id, '身份证号', v)} title="点击查看完整号码">
<Button type="link" size="small" style={{ padding: '8px 4px' }} onClick={() => handleViewSensitive(record.id, '身份证号', v)} title="点击查看完整号码">
<EyeOutlined style={{ fontSize: 12, color: '#999' }} />
</a>
</Button>
</span>
);
},
@@ -283,14 +282,14 @@ const StudentsPage: React.FC = () => {
dataIndex: 'tenant',
width: 100,
render: (tenant: { name?: string } | null) =>
tenant?.name ? <Tag color="purple">{tenant.name}</Tag> : '-',
tenant?.name ? <Tag color="purple" style={{ maxWidth: '100%', overflow: 'hidden', textOverflow: 'ellipsis' }}>{tenant.name}</Tag> : '-',
},
{ title: '负责人', dataIndex: 'supervisor', width: 100 },
{
title: '状态',
dataIndex: 'status',
width: 80,
render: (s: string) => <Tag color={statusMap[s]?.color}>{statusMap[s]?.text || s}</Tag>,
render: (s: string) => <Tag color={statusMap[s]?.color} style={{ maxWidth: '100%', overflow: 'hidden', textOverflow: 'ellipsis' }}>{statusMap[s]?.text || s}</Tag>,
},
{
title: '操作',
@@ -344,7 +343,7 @@ const StudentsPage: React.FC = () => {
</Space>
),
},
];
], [handleViewSensitive, openDrawer, showArchived, tenants]);
return (
<div>
@@ -513,12 +512,13 @@ const StudentsPage: React.FC = () => {
setEditing(null);
}}
okText="保存"
confirmLoading={saving}
>
<Form form={form} layout="vertical">
<Form.Item name="name" label="姓名" rules={[{ required: true }]}>
<Input />
</Form.Item>
<Form.Item name="studentNumber" label="学号">
<Form.Item name="studentNo" label="学号">
<Input placeholder="学生的学号" />
</Form.Item>
<Form.Item name="gender" label="性别">
@@ -533,7 +533,7 @@ const StudentsPage: React.FC = () => {
<Form.Item name="phone" label="电话">
<Input />
</Form.Item>
<Form.Item name="idNumber" label="学号/身份证">
<Form.Item name="idNumber" label="身份证">
<Input />
</Form.Item>
<Form.Item name="ethnicity" label="民族">
@@ -580,7 +580,7 @@ const StudentsPage: React.FC = () => {
title={null}
open={drawerOpen}
onClose={() => { setDrawerOpen(false); }}
width={720}
size={720}
>
{drawerStudentId && (
<StudentProfileContent

17
apps/admin/src/pages/TeacherWorkspace/index.tsx
View File

@@ -1,5 +1,5 @@
import React, { useEffect, useState } from 'react';
import { Card, Tabs, Table, Tag, Empty, Spin } from 'antd';
import React, { useEffect, useState, useMemo } from 'react';
import { Card, Tabs, Table, Tag, Empty, Spin, message } from 'antd';
import type { ColumnsType } from 'antd/es/table';
import api from '../../api';
@@ -65,6 +65,7 @@ const TeacherWorkspacePage: React.FC = () => {
setData(res);
} catch (e) {
console.error(e);
message.error('数据加载失败');
} finally {
setLoading(false);
}
@@ -72,7 +73,7 @@ const TeacherWorkspacePage: React.FC = () => {
fetchData();
}, []);
const classColumns: ColumnsType<AssignedClass> = [
const classColumns: ColumnsType<AssignedClass> = useMemo(() => [
{
title: '班级名称',
dataIndex: 'className',
@@ -88,9 +89,9 @@ const TeacherWorkspacePage: React.FC = () => {
dataIndex: 'subject',
render: (v: string | null) => v || '-',
},
];
], []);
const scheduleColumns: ColumnsType<ScheduleItem> = [
const scheduleColumns: ColumnsType<ScheduleItem> = useMemo(() => [
{
title: '时间',
key: 'time',
@@ -114,14 +115,14 @@ const TeacherWorkspacePage: React.FC = () => {
</Tag>
),
},
];
], []);
const studentColumns: ColumnsType<StudentItem> = [
const studentColumns: ColumnsType<StudentItem> = useMemo(() => [
{ title: '姓名', dataIndex: 'studentName' },
{ title: '学号', dataIndex: 'studentNo', render: (v: string) => v || '-' },
{ title: '班级', dataIndex: 'className' },
{ title: '加入日期', dataIndex: 'joinDate', render: (v: string) => v || '-' },
];
], []);
if (loading) {
return (

11
apps/admin/src/pages/Teachers/index.tsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect, useState, useCallback } from 'react';
import React, { useEffect, useState, useCallback, useMemo } from 'react';
import { Table, Input, Button, Modal, Form, Select, DatePicker, Tag, Space, message } from 'antd';
import { EditOutlined } from '@ant-design/icons';
import dayjs from 'dayjs';
@@ -51,6 +51,7 @@ const TeachersPage: React.FC = () => {
const [search, setSearch] = useState('');
const [profileModal, setProfileModal] = useState<TeacherRow | null>(null);
const [form] = Form.useForm<ProfileFormValues>();
const [saving, setSaving] = useState(false);
const fetchData = useCallback(async () => {
setLoading(true);
@@ -73,6 +74,7 @@ const TeachersPage: React.FC = () => {
const handleSaveProfile = async () => {
const values = await form.validateFields();
if (!profileModal) return;
setSaving(true);
try {
await api.put(`/rbac/teachers/${profileModal.id}/profile`, {
subjects: values.subjects || [],
@@ -88,10 +90,12 @@ const TeachersPage: React.FC = () => {
msg = String(e.message);
}
message.error(msg);
} finally {
setSaving(false);
}
};
const columns = [
const columns = useMemo(() => [
{ title: '姓名', dataIndex: 'name', key: 'name', width: 120 },
{ title: '用户名', dataIndex: 'username', key: 'username', width: 130 },
{
@@ -166,7 +170,7 @@ const TeachersPage: React.FC = () => {
</Button>
),
},
];
], []);
return (
<div>
@@ -216,6 +220,7 @@ const TeachersPage: React.FC = () => {
onOk={handleSaveProfile}
onCancel={() => setProfileModal(null)}
okText="保存"
confirmLoading={saving}
>
<Form form={form} layout="vertical">
<Form.Item name="subjects" label="任教学科">

69
apps/admin/src/pages/Tenants/index.tsx
View File

@@ -23,6 +23,7 @@ const TenantsPage: React.FC = () => {
const [modalOpen, setModalOpen] = useState(false);
const [editing, setEditing] = useState<any>(null);
const [form] = Form.useForm();
const [saving, setSaving] = useState(false);
const [searchText, setSearchText] = useState('');
const [filterStatus, setFilterStatus] = useState<string | undefined>(undefined);
@@ -55,6 +56,7 @@ const TenantsPage: React.FC = () => {
const handleSave = async () => {
const values = await form.validateFields();
setSaving(true);
try {
if (editing) {
await api.put(`/tenants/${editing.id}`, values);
@@ -69,6 +71,8 @@ const TenantsPage: React.FC = () => {
fetchData();
} catch (e: any) {
message.error(e?.message || '操作失败');
} finally {
setSaving(false);
}
};
@@ -82,7 +86,7 @@ const TenantsPage: React.FC = () => {
}
};
const columns = [
const columns = useMemo(() => [
{
title: '租赁方名称', width: 120,
dataIndex: 'name',
@@ -148,7 +152,7 @@ const TenantsPage: React.FC = () => {
</Space>
),
},
];
], [handleArchive]);
return (
<div>
@@ -203,6 +207,7 @@ const TenantsPage: React.FC = () => {
setEditing(null);
}}
okText="保存"
confirmLoading={saving}
>
<Form form={form} layout="vertical">
<Form.Item name="name" label="名称" rules={[{ required: true }]}>
@@ -215,28 +220,44 @@ const TenantsPage: React.FC = () => {
<Input />
</Form.Item>
<Form.Item name="color" label="标签颜色" tooltip="可视化排期时用的颜色，留空则自动分配">
<Input
placeholder="#40a9ff"
addonAfter={
<Space size={4}>
{PRESET_COLORS.map((c) => (
<span
key={c}
onClick={() => form.setFieldValue('color', c)}
style={{
display: 'inline-block',
width: 16,
height: 16,
background: c,
borderRadius: 3,
cursor: 'pointer',
border: '1px solid #d9d9d9',
}}
/>
))}
</Space>
}
/>
<Space.Compact>
<Input placeholder="#40a9ff" style={{ flex: 1 }} />
<span
style={{
padding: '0 4px',
display: 'flex',
alignItems: 'center',
border: '1px solid #d9d9d9',
backgroundColor: '#fafafa',
gap: 4,
}}
>
{PRESET_COLORS.map((c) => (
<span
key={c}
role="button"
tabIndex={0}
aria-label={`选择颜色 ${c}`}
onClick={() => form.setFieldValue('color', c)}
onKeyDown={(e) => {
if (e.key === 'Enter' || e.key === ' ') {
e.preventDefault();
form.setFieldValue('color', c);
}
}}
style={{
display: 'inline-block',
width: 28,
height: 28,
background: c,
borderRadius: 3,
cursor: 'pointer',
border: '1px solid #d9d9d9',
}}
/>
))}
</span>
</Space.Compact>
</Form.Item>
<Form.Item name="notes" label="备注">
<Input.TextArea rows={2} />

60
apps/admin/src/pages/Users/index.tsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect, useState } from 'react';
import React, { useEffect, useState, useMemo, useCallback } from 'react';
import {
Table,
Modal,
@@ -11,7 +11,7 @@ import {
Popconfirm,
message,
} from 'antd';
import { PlusOutlined, EditOutlined, DeleteOutlined, KeyOutlined, IdcardOutlined } from '@ant-design/icons';
import { PlusOutlined, EditOutlined, DeleteOutlined, KeyOutlined, IdcardOutlined, CloudDownloadOutlined } from '@ant-design/icons';
import dayjs from 'dayjs';
import api from '../../api';
import PermissionButton from '../../components/PermissionButton';
@@ -29,6 +29,8 @@ const UsersPage: React.FC = () => {
const [profileForm] = Form.useForm();
const [form] = Form.useForm();
const [pwdForm] = Form.useForm();
const [syncing, setSyncing] = useState(false);
const [saving, setSaving] = useState(false);
const handleOpenProfile = async (record: any) => {
setProfileUser(record);
@@ -42,14 +44,21 @@ const UsersPage: React.FC = () => {
};
const handleProfileSubmit = async () => {
setSaving(true);
const values = await profileForm.validateFields();
await api.put(`/rbac/users/${profileUser.id}/profile`, values);
message.success('档案更新成功');
setProfileModalOpen(false);
fetchData();
try {
await api.put(`/rbac/users/${profileUser.id}/profile`, values);
message.success('档案更新成功');
setProfileModalOpen(false);
fetchData();
} catch (e: any) {
message.error(e.message || '操作失败');
} finally {
setSaving(false);
}
};
const fetchData = async () => {
const fetchData = useCallback(async () => {
setLoading(true);
try {
const [users, rolesRes] = await Promise.all([
@@ -62,11 +71,25 @@ const UsersPage: React.FC = () => {
console.error(e);
}
setLoading(false);
}, []);
const handleSyncDingTalk = async () => {
setSyncing(true);
try {
const res: any = await api.post('/sync/trigger?platform=dingtalk');
const log = res.logs?.[0];
message.success(`同步完成：${log?.recordsCount || 0} 条记录`);
fetchData();
} catch (e: any) {
message.error(e?.message || '同步失败');
} finally {
setSyncing(false);
}
};
useEffect(() => {
fetchData();
}, []);
}, [fetchData]);
const handleAdd = () => {
setEditing(null);
@@ -86,6 +109,7 @@ const UsersPage: React.FC = () => {
};
const handleSubmit = async () => {
setSaving(true);
const values = await form.validateFields();
try {
if (editing) {
@@ -109,6 +133,8 @@ const UsersPage: React.FC = () => {
fetchData();
} catch (e: any) {
message.error(e.message || '操作失败');
} finally {
setSaving(false);
}
};
@@ -129,6 +155,7 @@ const UsersPage: React.FC = () => {
};
const handlePwdSubmit = async () => {
setSaving(true);
const values = await pwdForm.validateFields();
try {
await api.put(`/rbac/users/${resetTarget.id}/password`, { password: values.password });
@@ -136,10 +163,12 @@ const UsersPage: React.FC = () => {
setPwdModalOpen(false);
} catch (e: any) {
message.error(e.message || '操作失败');
} finally {
setSaving(false);
}
};
const columns = [
const columns = useMemo(() => [
{ title: 'ID', dataIndex: 'id', width: 60 },
{ title: '用户名', dataIndex: 'username', width: 120 },
{ title: '姓名', dataIndex: 'name', width: 120 },
@@ -219,7 +248,7 @@ const UsersPage: React.FC = () => {
</Space>
),
},
];
], []);
return (
<div>
@@ -242,6 +271,14 @@ const UsersPage: React.FC = () => {
>
新增账号
</PermissionButton>
<PermissionButton
permission="sync:trigger"
icon={<CloudDownloadOutlined />}
loading={syncing}
onClick={handleSyncDingTalk}
>
同步钉钉用户
</PermissionButton>
</div>
<Table
columns={columns}
@@ -258,6 +295,7 @@ const UsersPage: React.FC = () => {
onOk={handleSubmit}
onCancel={() => setModalOpen(false)}
destroyOnHidden
confirmLoading={saving}
>
<Form form={form} layout="vertical">
<Form.Item
@@ -309,6 +347,7 @@ const UsersPage: React.FC = () => {
onOk={handlePwdSubmit}
onCancel={() => setPwdModalOpen(false)}
destroyOnHidden
confirmLoading={saving}
>
<Form form={pwdForm} layout="vertical">
<Form.Item
@@ -327,6 +366,7 @@ const UsersPage: React.FC = () => {
onOk={handleProfileSubmit}
onCancel={() => setProfileModalOpen(false)}
destroyOnHidden
confirmLoading={saving}
>
<Form form={profileForm} layout="vertical">
<Form.Item name="joinedAt" label="入职日期">

226
apps/admin/src/test/fixtures.ts Normal file
View File

@@ -0,0 +1,226 @@
/**
* Test fixtures — consistent test data used across integration tests.
*
* These mirror the PRD data models and are used to seed/verify API responses.
* All IDs are prefixed "test-" to distinguish from real data in a shared dev DB.
*/
// ── Auth ────────────────────────────────────────────────────────────
export const CREDENTIALS = {
superAdmin: { username: 'admin', password: 'admin123' },
staff: { username: 'staff1', password: 'staff123' },
classTeacher: { username: 'teacher1', password: 'teacher123' },
student: { username: 'student1', password: 'student123' },
} as const;
// ── Student (PRD §3) ────────────────────────────────────────────────
export const SAMPLE_STUDENT = {
name: '测试学员A',
phone: '13800000001',
idCard: '110101200001011234',
gender: '男',
ethnicity: '汉族',
status: 'active',
emergencyContact: '张三',
emergencyPhone: '13900000001',
studentNo: 'TEST-2026-001',
};
export const SAMPLE_STUDENT_B = {
name: '测试学员B',
phone: '13800000002',
idCard: '110101200001011235',
gender: '女',
ethnicity: '汉族',
status: 'active',
emergencyContact: '李四',
emergencyPhone: '13900000002',
studentNo: 'TEST-2026-002',
};
// ── Class (PRD §5) ──────────────────────────────────────────────────
export const SAMPLE_CLASS = {
name: '2026届文化课冲刺1班',
code: 'TEST-WHK-2026-001',
classType: '文化课',
startDate: '2026-03-01',
endDate: '2026-06-30',
status: '在读',
maxStudents: 40,
};
// ── Schedule (PRD §6) ───────────────────────────────────────────────
export const SAMPLE_SCHEDULE = {
weekDay: 1, // 周一
startTime: '09:00',
endTime: '10:30',
subject: '语文',
scheduleType: 'INTERNAL',
status: 'active',
};
// Conflicting schedule: same classroom, same weekday, overlapping time
export const CONFLICT_SCHEDULE = {
weekDay: 1,
startTime: '09:30', // overlaps with 09:00-10:30
endTime: '11:00',
subject: '数学',
scheduleType: 'INTERNAL',
status: 'active',
};
// Non-conflicting: same classroom, same weekday, non-overlapping
export const NON_CONFLICT_SCHEDULE = {
weekDay: 1,
startTime: '10:30', // exactly at boundary — no overlap
endTime: '12:00',
subject: '英语',
scheduleType: 'INTERNAL',
status: 'active',
};
// ── Room / Dormitory (PRD §7) ───────────────────────────────────────
export const SAMPLE_ROOM = {
roomNumber: 'TEST-401',
building: '1号楼',
floor: 4,
capacity: 6,
status: 'available',
gender: '男',
rentalCategory: 'short',
roomType: '标准间',
};
export const SAMPLE_LONG_RENT_ROOM = {
roomNumber: 'TEST-501',
building: '1号楼',
floor: 5,
capacity: 4,
status: 'available',
gender: '女',
rentalCategory: 'long',
monthlyRate: 800,
roomType: '标准间',
};
// ── Occupancy (PRD §8) ──────────────────────────────────────────────
export const SAMPLE_OCCUPANCY = {
checkInDate: '2026-03-01',
billingStartDate: '2026-03-01',
billingEndDate: '2026-06-30',
rentalType: 'short',
};
// ── Bill / Expense (PRD §9-10) ──────────────────────────────────────
export const SAMPLE_EXPENSE = {
type: 'water',
amount: 150.0,
billingMonth: '2026-03',
description: '3月水费公摊',
};
export const SAMPLE_PERSONAL_EXPENSE = {
type: 'damage',
amount: 50.0,
description: '损坏赔偿-台灯',
};
// ── Deposit (PRD §11) ───────────────────────────────────────────────
export const SAMPLE_DEPOSIT = {
amount: 500.0,
type: 'collect' as const,
notes: '入学押金',
};
// ── Attendance (PRD §13) ────────────────────────────────────────────
export const SAMPLE_ATTENDANCE = {
attendanceDate: '2026-03-15',
session: '上午',
status: '出勤',
source: '人工点名',
courseName: '语文',
};
export const SAMPLE_ATTENDANCE_ABSENT = {
attendanceDate: '2026-03-16',
session: '上午',
status: '缺勤',
source: '人工点名',
courseName: '语文',
};
// ── Classroom (PRD §6) ──────────────────────────────────────────────
export const SAMPLE_CLASSROOM = {
name: 'TEST-301教室',
building: '教学楼A',
floor: 3,
capacity: 50,
roomType: '大',
status: 'available',
};
// ── Tenant (PRD §12) ────────────────────────────────────────────────
export const SAMPLE_TENANT = {
name: '测试合作机构A',
contact: '王经理',
phone: '13700000001',
color: '#1890ff',
status: 'active',
};
// ── Operation Log expectation (PRD §18) ─────────────────────────────
export const LOG_ACTIONS = {
STUDENT_CREATE: { module: 'students', action: 'create' },
STUDENT_UPDATE: { module: 'students', action: 'update' },
STUDENT_DELETE: { module: 'students', action: 'delete' },
BILL_GENERATE: { module: 'bills', action: 'generate' },
BILL_CONFIRM: { module: 'bills', action: 'confirm' },
DEPOSIT_COLLECT: { module: 'deposits', action: 'collect' },
DEPOSIT_REFUND: { module: 'deposits', action: 'refund' },
OCCUPANCY_CHECKIN: { module: 'occupancies', action: 'create' },
OCCUPANCY_CHECKOUT: { module: 'occupancies', action: 'checkout' },
EXPENSE_CREATE: { module: 'expenses', action: 'create' },
CLASS_CREATE: { module: 'classes', action: 'create' },
CLASS_DELETE: { module: 'classes', action: 'delete' },
SCHEDULE_CREATE: { module: 'schedules', action: 'create' },
ATTENDANCE_BATCH: { module: 'attendance', action: 'batch' },
SENSITIVE_VIEW: { module: 'students', action: 'view_sensitive' },
} as const;
// ── Permission nodes (PRD §17) ──────────────────────────────────────
export const PERMISSION_NODES = [
'student:view', 'student:add', 'student:update', 'student:delete',
'student:import', 'student:export',
'room:view', 'room:add', 'room:update', 'room:delete',
'occupancy:view', 'occupancy:add', 'occupancy:update',
'bill:view', 'bill:generate', 'bill:confirm', 'bill:markPaid', 'bill:export',
'expense:view', 'expense:add', 'expense:update', 'expense:delete',
'deposit:view', 'deposit:collect', 'deposit:refund',
'class:view', 'class:add', 'class:update', 'class:delete',
'schedule:view', 'schedule:add', 'schedule:update', 'schedule:delete',
'attendance:view', 'attendance:add', 'attendance:update', 'attendance:delete',
'attendance:batch',
'classroom:view', 'classroom:add', 'classroom:update', 'classroom:delete',
'tenant:view', 'tenant:add', 'tenant:update', 'tenant:delete',
'rental:view', 'rental:add', 'rental:update', 'rental:delete',
'archive:view', 'archive:import', 'archive:export',
'report:generate',
'log:view',
'role:view', 'role:add', 'role:update', 'role:delete',
'user:view', 'user:add', 'user:update', 'user:delete',
'department:view', 'department:add', 'department:update', 'department:delete',
'dashboard:view',
] as const;

168
apps/admin/src/test/helpers.ts Normal file
View File

@@ -0,0 +1,168 @@
/**
* Shared browser-test helpers.
*
* Import this in every `*.integration.test.ts` file.
* Provides login, API calling, and page-navigation utilities
* that work inside the Vitest browser environment.
*/
import { expect } from 'vitest';
import { CREDENTIALS } from './fixtures';
import { BASE } from './setup';
// ── Types ───────────────────────────────────────────────────────────
interface ApiResponse<T = unknown> {
code: number;
data: T;
message?: string;
}
type Role = keyof typeof CREDENTIALS;
// ── Auth helpers ────────────────────────────────────────────────────
/**
* Login as a specific role and store the token in localStorage.
* Returns the parsed response data.
*/
export async function loginAs(role: Role): Promise<{ token: string; user: Record<string, unknown> }> {
const creds = CREDENTIALS[role];
const res = await fetch(`${BASE}/api/auth/login`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(creds),
});
expect(res.status).toBe(201);
const json = (await res.json()) as ApiResponse<{ token: string; user: Record<string, unknown> }>;
expect(json.code).toBe(0);
localStorage.setItem('token', json.data.token);
localStorage.setItem('user', JSON.stringify(json.data.user));
return json.data;
}
/**
* Logout: clear localStorage.
*/
export function logout(): void {
localStorage.removeItem('token');
localStorage.removeItem('user');
localStorage.removeItem('permissions');
localStorage.removeItem('currentCampusId');
}
// ── API helpers (authenticated) ─────────────────────────────────────
function authHeaders(): Record<string, string> {
const token = localStorage.getItem('token');
return {
'Content-Type': 'application/json',
...(token ? { Authorization: `Bearer ${token}` } : {}),
};
}
export async function apiGet<T = unknown>(url: string): Promise<ApiResponse<T>> {
const res = await fetch(`${BASE}${url}`, { headers: authHeaders() });
return (await res.json()) as ApiResponse<T>;
}
export async function apiPost<T = unknown>(url: string, body?: unknown): Promise<ApiResponse<T>> {
const res = await fetch(`${BASE}${url}`, {
method: 'POST',
headers: authHeaders(),
body: body ? JSON.stringify(body) : undefined,
});
return (await res.json()) as ApiResponse<T>;
}
export async function apiPut<T = unknown>(url: string, body?: unknown): Promise<ApiResponse<T>> {
const res = await fetch(`${BASE}${url}`, {
method: 'PUT',
headers: authHeaders(),
body: body ? JSON.stringify(body) : undefined,
});
return (await res.json()) as ApiResponse<T>;
}
export async function apiDelete<T = unknown>(url: string): Promise<ApiResponse<T>> {
const res = await fetch(`${BASE}${url}`, {
method: 'DELETE',
headers: authHeaders(),
});
return (await res.json()) as ApiResponse<T>;
}
// ── Page helpers ────────────────────────────────────────────────────
/**
* Navigate to a page and wait for it to load.
*/
export async function goTo(path: string): Promise<void> {
document.location.href = `${BASE}${path}`;
// Wait for React to render
await new Promise((r) => setTimeout(r, 500));
}
/**
* Assert the current page URL contains the given path.
*/
export async function assertOnPage(path: string): Promise<void> {
// Wait a tick for SPA routing
await new Promise((r) => setTimeout(r, 300));
expect(window.location.pathname).toContain(path);
}
// ── Wait helpers ────────────────────────────────────────────────────
/** Poll until a condition is true or timeout. */
export async function waitFor(
condition: () => boolean | Promise<boolean>,
timeout = 5000,
interval = 200,
): Promise<void> {
const start = Date.now();
while (Date.now() - start < timeout) {
if (await condition()) return;
await new Promise((r) => setTimeout(r, interval));
}
throw new Error(`waitFor timed out after ${timeout}ms`);
}
// ── Assertion helpers ───────────────────────────────────────────────
/** Assert an API response is successful (code === 0). */
export function assertOk<T>(res: ApiResponse<T>, msg?: string): T {
expect(res.code, msg ?? 'API should return code 0').toBe(0);
return res.data;
}
/** Assert an API response is an error (code !== 0). */
export function assertError(res: ApiResponse, expectedCode?: number): void {
expect(res.code).not.toBe(0);
if (expectedCode !== undefined) {
expect(res.code).toBe(expectedCode);
}
}
/** Assert a 403 is returned (permission denied). */
export async function assertForbidden(promise: Promise<Response>): Promise<void> {
const res = await promise;
expect(res.status).toBe(403);
}
/** Assert a 401 is returned (unauthenticated). */
export async function assertUnauthenticated(promise: Promise<Response>): Promise<void> {
const res = await promise;
expect(res.status).toBe(401);
}
// ── Sensitive data helpers (PRD §3.3) ───────────────────────────────
/** Assert phone number is masked: 138****0001 */
export function assertPhoneMasked(displayed: string): void {
expect(displayed).toMatch(/^\d{3}\*{4}\d{4}$/);
}
/** Assert ID card is masked: 110101********1234 */
export function assertIdCardMasked(displayed: string): void {
expect(displayed).toMatch(/^\d{6}\*{8}\d{4}$/);
}

24
apps/admin/src/test/setup.ts Normal file
View File

@@ -0,0 +1,24 @@
/**
* Vitest browser-mode setup.
* Runs once before all tests.
*/
import { beforeAll, afterEach } from 'vitest';
// Base URL: the Vite dev server proxies /api → localhost:3003
const BASE = 'http://localhost:3002';
beforeAll(() => {
// Ensure we're running against the local dev server
console.log(`[setup] browser integration tests → ${BASE}`);
});
afterEach(() => {
// Clear localStorage between tests to avoid state leakage
// (only clear auth-related keys; keep other state if needed)
localStorage.removeItem('token');
localStorage.removeItem('user');
localStorage.removeItem('permissions');
localStorage.removeItem('currentCampusId');
});
export { BASE };

31
apps/admin/src/utils/download.ts Normal file
View File

@@ -0,0 +1,31 @@
/**
* Download a file from the API as a blob and trigger a browser download.
*
* @param endpoint - API path (e.g. '/rooms/template')
* @param filename - Suggested filename for the download
*/
export async function downloadBlob(endpoint: string, filename: string): Promise<void> {
const baseURL = import.meta.env.PROD
? '/api'
: `http://localhost:${import.meta.env.VITE_API_PORT || 3002}/api`;
const token = localStorage.getItem('token');
const res = await fetch(`${baseURL}${endpoint}`, {
headers: { Authorization: `Bearer ${token}` },
});
if (!res.ok) {
const text = await res.text().catch(() => '');
throw new Error(text || `下载失败 (HTTP ${res.status})`);
}
const blob = await res.blob();
const url = URL.createObjectURL(blob);
const a = document.createElement('a');
a.href = url;
a.download = filename;
document.body.appendChild(a);
a.click();
document.body.removeChild(a);
URL.revokeObjectURL(url);
}

9
apps/admin/src/utils/sensitive.ts Normal file
View File

@@ -0,0 +1,9 @@
export const maskPhone = (phone: string): string => {
if (!phone || phone.length < 7) return phone || '-';
return phone.slice(0, 3) + '****' + phone.slice(-4);
};
export const maskIdNumber = (id: string): string => {
if (!id || id.length < 8) return id || '-';
return id.slice(0, 3) + '***********' + id.slice(-4);
};

2
apps/admin/vite.config.ts
View File

@@ -8,7 +8,7 @@ export default defineConfig({
port: 3002,
proxy: {
'/api': {
target: 'http://localhost:3003',
target: 'http://localhost:3000',
changeOrigin: true,
},
},

38
apps/admin/vitest.config.ts Normal file
View File

@@ -0,0 +1,38 @@
import { defineConfig } from 'vitest/config';
import react from '@vitejs/plugin-react';
import path from 'node:path';
export default defineConfig({
plugins: [react()],
resolve: {
alias: {
'@': path.resolve(__dirname, 'src'),
},
},
test: {
// Browser mode: tests run inside a real Chromium browser via Playwright
browser: {
enabled: true,
name: 'chromium',
provider: 'playwright',
headless: true,
// Slow down interactions slightly so UI animations settle
slowHijackESM: false,
},
// Integration tests: match *.integration.test.{ts,tsx}
include: ['src/**/*.integration.test.{ts,tsx}'],
// Global timeout for browser operations
testTimeout: 30_000,
// Retry flaky browser tests once
retry: 1,
// Coverage
coverage: {
provider: 'v8',
reporter: ['text', 'lcov'],
include: ['src/**/*.{ts,tsx}'],
exclude: ['src/**/*.test.*', 'src/**/*.spec.*'],
},
// Setup file for global test helpers
setupFiles: ['./src/test/setup.ts'],
},
});

19
apps/server/src/app.module.ts
View File

@@ -36,8 +36,10 @@ import {
StudentEnrollment,
ExamScore,
LearningRecord,
ExpenseType,
ResultArchive,
ArchiveAttachment,
UserDingMapping,
} from './entities';
import { AuthModule } from './auth/auth.module';
import { RbacModule } from './rbac/rbac.module';
@@ -62,6 +64,12 @@ import { NotificationsModule } from './notifications/notifications.module';
import { DepartmentsModule } from './departments/departments.module';
import { CommonModule } from './common/common.module';
import { ArchiveModule } from './archive/archive.module';
import { SeedModule } from './seed/seed.module';
import { ExpenseTypesModule } from './expense-types/expense-types.module';
import { IntegrationConfig, IntegrationConfigDetail } from './integration/entities/integration-config.entity';
import { IntegrationConfigModule } from './integration/config/config.module';
import { CampusScopeMiddleware } from './common/campus-scope.middleware';
@Module({
imports: [
@@ -108,8 +116,14 @@ import { CampusScopeMiddleware } from './common/campus-scope.middleware';
StudentEnrollment,
ExamScore,
LearningRecord,
ResultArchive,
ExpenseType,
ArchiveAttachment,
ResultArchive,
SyncLog,
SyncState,
UserDingMapping,
IntegrationConfig,
IntegrationConfigDetail,
];
if (dbType === 'mysql') {
return {
@@ -153,6 +167,9 @@ import { CampusScopeMiddleware } from './common/campus-scope.middleware';
DepartmentsModule,
CommonModule,
ArchiveModule,
SeedModule,
IntegrationConfigModule,
ExpenseTypesModule,
],
providers: [
{ provide: APP_GUARD, useClass: ThrottlerGuard },

258
apps/server/src/attendance/attendance-import.service.ts Normal file
View File

@@ -0,0 +1,258 @@
import { Injectable, Logger } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository, In } from 'typeorm';
import { Subject, Observable } from 'rxjs';
import {
DingAttendanceRaw,
Student,
UserDingMapping,
} from '../entities';
import { DingTalkService, DingTalkAttendanceResult } from '../integration/dingtalk.service';
import { AttendanceService } from './attendance.service';
import type { ImportProgressEvent, ImportResult } from './dto/dingtalk-import.dto';
/**
* Service for importing DingTalk attendance data into the system.
*
* ## Stream Architecture
* Uses RxJS Subjects to emit progress events during the import pipeline:
* fetch → parse → deduplicate → save → auto-match
*
* Progress is exposed as an Observable so the controller can relay it via SSE.
* Only ONE import can run at a time (guarded by `isRunning`).
*/
@Injectable()
export class AttendanceImportService {
private readonly logger = new Logger(AttendanceImportService.name);
/** RxJS Subject emitting live progress during import */
private progressSubject = new Subject<ImportProgressEvent>();
private isRunning = false;
constructor(
@InjectRepository(DingAttendanceRaw)
private readonly dingRawRepo: Repository<DingAttendanceRaw>,
@InjectRepository(Student)
private readonly studentRepo: Repository<Student>,
@InjectRepository(UserDingMapping)
private readonly userDingMappingRepo: Repository<UserDingMapping>,
private readonly dingTalkService: DingTalkService,
private readonly attendanceService: AttendanceService,
) {}
/**
* Expose progress as a read-only Observable for SSE.
*/
get progress$(): Observable<ImportProgressEvent> {
return this.progressSubject.asObservable();
}
/**
* Whether an import is currently in progress.
*/
get running(): boolean {
return this.isRunning;
}
/**
* Run the DingTalk attendance import pipeline.
*
* Pipeline stages:
* 1. Fetch attendance results from DingTalk (paginated)
* 2. Parse and validate each record
* 3. Deduplicate by `dingId` (unique in DB)
* 4. Batch-save to `ding_attendance_raw`
* 5. Optionally auto-match to students by name
*/
async importFromDingTalk(params: {
startDate: string;
endDate: string;
userIds?: string[];
autoMatch?: boolean;
}): Promise<ImportResult> {
if (this.isRunning) {
throw new Error('An import is already in progress');
}
const startedAt = Date.now();
this.isRunning = true;
// Safety timeout: auto-reset isRunning after 30 minutes in case of
// an unhandled exception that bypasses the finally block (extremely rare).
const SAFETY_TIMEOUT_MS = 30 * 60 * 1000;
const safetyTimer = setTimeout(() => {
if (this.isRunning) {
this.logger.error('Import safety timeout triggered — force-resetting isRunning');
this.isRunning = false;
}
}, SAFETY_TIMEOUT_MS);
const errors: string[] = [];
let imported = 0;
let skipped = 0;
let matched = 0;
try {
// Stage 1: Fetch
this.emit('fetching', 0, 0, 'Fetching attendance results from DingTalk...');
const rawResults = await this.fetchAllPages(params);
const total = rawResults.length;
this.emit('fetching', total, total, `Fetched ${total} raw attendance records`);
// Stage 2: Parse & deduplicate
this.emit('parsing', 0, total, `Parsing ${total} records...`);
const existingDingIds = await this.getExistingDingIds(rawResults);
const newRecords = rawResults.filter((r) => !existingDingIds.has(r.checkId));
skipped = rawResults.length - newRecords.length;
this.emit('parsing', newRecords.length, total, `${newRecords.length} new records, ${skipped} duplicates skipped`);
if (newRecords.length === 0) {
this.emit('complete', imported + skipped, total, 'Nothing new to import');
return { success: true, imported, skipped, matched, errors, duration: Date.now() - startedAt };
}
// Stage 3: Batch save
this.emit('saving', 0, newRecords.length, `Saving ${newRecords.length} records...`);
const batchSize = 100;
for (let i = 0; i < newRecords.length; i += batchSize) {
const batch = newRecords.slice(i, i + batchSize);
const entities = batch.map((r) => this.mapToEntity(r));
try {
await this.dingRawRepo.save(entities, { chunk: 50 });
imported += entities.length;
this.emit('saving', imported, newRecords.length, `Saved ${imported}/${newRecords.length}`);
} catch (err: unknown) {
const msg = err instanceof Error ? err.message : String(err);
errors.push(`Batch save error at offset ${i}: ${msg}`);
this.logger.error(`Batch save error: ${msg}`);
}
}
// Stage 4: Auto-match (optional)
if (params.autoMatch && imported > 0) {
this.emit('matching', 0, imported, 'Auto-matching records to students...');
matched = await this.autoMatchUnmatched();
this.emit('matching', matched, imported, `Matched ${matched} records to students`);
}
const duration = Date.now() - startedAt;
this.emit('complete', imported, rawResults.length, `Import complete: ${imported} new, ${skipped} skipped, ${matched} matched (${duration}ms)`);
this.logger.log(`DingTalk attendance import done: ${imported} imported, ${skipped} skipped, ${matched} matched`);
return { success: true, imported, skipped, matched, errors, duration };
} catch (err: unknown) {
const msg = err instanceof Error ? err.message : String(err);
errors.push(msg);
this.emit('error', imported, 0, `Import failed: ${msg}`, msg);
this.logger.error(`DingTalk attendance import failed: ${msg}`);
return { success: false, imported, skipped, matched, errors, duration: Date.now() - startedAt };
} finally {
clearTimeout(safetyTimer);
this.isRunning = false;
}
}
/**
* Paginate through DingTalk attendance API.
* The DingTalk API returns max 50 records per page.
*/
private async fetchAllPages(params: {
startDate: string;
endDate: string;
userIds?: string[];
}): Promise<DingTalkAttendanceResult[]> {
const allResults: DingTalkAttendanceResult[] = [];
const pageSize = 50;
let offset = 0;
let hasMore = true;
while (hasMore) {
const batch = await this.dingTalkService.fetchAttendanceResults({
startDate: params.startDate,
endDate: params.endDate,
userIds: params.userIds,
offset,
limit: pageSize,
});
if (batch.length === 0) {
hasMore = false;
} else {
allResults.push(...batch);
offset += batch.length;
this.emit('fetching', allResults.length, allResults.length + (batch.length < pageSize ? 0 : pageSize), `Fetched ${allResults.length} records...`);
// If last page was smaller than pageSize, we're done
if (batch.length < pageSize) hasMore = false;
}
}
return allResults;
}
/**
* Query which dingIds already exist to skip duplicates.
*/
private async getExistingDingIds(
results: DingTalkAttendanceResult[],
): Promise<Set<string>> {
const dingIds = results.map((r) => r.checkId).filter(Boolean);
if (dingIds.length === 0) return new Set();
const existing = await this.dingRawRepo.find({
where: { dingId: In(dingIds) },
select: ['dingId'],
});
return new Set(existing.map((e) => e.dingId));
}
/**
* Map a DingTalk API result to a DingAttendanceRaw entity.
*/
private mapToEntity(r: DingTalkAttendanceResult): DingAttendanceRaw {
const entity = new DingAttendanceRaw();
entity.dingUserId = r.userId;
entity.userName = ''; // Will be filled from the result if available
entity.attendanceDate = r.workDate;
entity.dingId = r.checkId;
entity.attendanceType = r.checkType || 'OnDuty';
entity.timeResult = r.timeResult;
entity.locationResult = r.locationResult || '';
// Parse check-in/out times
if (r.actualCheckTime) {
const dt = new Date(r.actualCheckTime);
if (!isNaN(dt.getTime())) {
if (r.checkType === 'OnDuty') {
entity.checkInTime = dt;
} else {
entity.checkOutTime = dt;
}
}
}
entity.matchStatus = '未处理';
entity.rawData = JSON.stringify(r);
return entity;
}
/**
* Auto-match unmatched records to students via the dingUserId → userId mapping chain.
*
* Delegates to {@link AttendanceService.autoMatchDingRecords} to avoid duplicate logic.
*/
private async autoMatchUnmatched(): Promise<number> {
const result = await this.attendanceService.autoMatchDingRecords();
return result.matched;
}
/**
* Emit a progress event to the stream.
*/
private emit(
phase: ImportProgressEvent['phase'],
current: number,
total: number,
message: string,
error?: string,
): void {
this.progressSubject.next({ phase, current, total, message, error });
}
}

84
apps/server/src/attendance/attendance.controller.ts
View File

@@ -4,6 +4,7 @@ import {
Post,
Put,
Delete,
Sse,
Body,
Param,
Query,
@@ -11,8 +12,11 @@ import {
Request,
Res,
} from '@nestjs/common';
import type { Response } from 'express';
import { Observable } from 'rxjs';
import type { Request as ExpressRequest, Response } from 'express';
import { AttendanceService } from './attendance.service';
import { AttendanceImportService } from './attendance-import.service';
import { DingTalkImportDto } from './dto/dingtalk-import.dto';
import {
BatchCreateAttendanceDto,
AttendanceSummaryQueryDto,
@@ -30,11 +34,27 @@ import { extractRequestInfo } from '../common/request-utils';
import { RequirePermission } from '../auth/decorators/permission.decorator';
import * as ExcelJS from 'exceljs';
/** SSE event shape for @Sse() decorator */
interface SseEvent {
data: string | Record<string, unknown>;
id?: string;
type?: string;
retry?: number;
}
/** Minimal request user shape for type safety */
interface RequestUser {
id: number;
username: string;
role?: string;
}
@UseGuards(JwtAuthGuard)
@Controller()
export class AttendanceController {
constructor(
private readonly service: AttendanceService,
private readonly importService: AttendanceImportService,
private readonly logService: OperationLogsService,
) {}
@@ -320,4 +340,66 @@ export class AttendanceController {
async autoMatch() {
return this.service.autoMatchDingRecords();
}
// ═══════════════════════════════════════════════════════════════
// DingTalk attendance import with SSE streaming progress
// ═══════════════════════════════════════════════════════════════
/**
* Trigger DingTalk attendance import.
* Mirrors `dws attendance check result` pipeline:
* fetch → parse → deduplicate → save → auto-match.
*/
@Post('attendance-records/import/dingtalk')
@RequirePermission('attendance:create')
async importFromDingTalk(
@Body() dto: DingTalkImportDto,
@Request() req: { user: RequestUser },
) {
const { ipAddress, userAgent } = extractRequestInfo(req);
const result = await this.importService.importFromDingTalk({
startDate: dto.start,
endDate: dto.end,
userIds: dto.users?.split(',').map((s) => s.trim()).filter(Boolean),
autoMatch: dto.autoMatch ?? true,
});
await this.logService.log({
userId: req.user?.id,
username: req.user?.username,
module: '考勤管理',
action: '钉钉考勤导入',
detail: `${dto.start}~${dto.end}, 导入=${result.imported}, 跳过=${result.skipped}, 匹配=${result.matched}`,
ipAddress,
userAgent,
});
return result;
}
/**
* SSE stream for live import progress.
* Connect before triggering the import to receive real-time progress events.
*
* NOTE: @RequirePermission works with @Sse() in NestJS because guards
* execute in the standard request pipeline before the SSE handler is invoked.
* If this ever breaks after a NestJS upgrade, verify guard execution order.
*/
@Sse('attendance-records/import/dingtalk/stream')
@RequirePermission('attendance:view')
importProgressStream(): Observable<SseEvent> {
return new Observable<SseEvent>((subscriber) => {
const subscription = this.importService.progress$.subscribe({
next: (event) => {
subscriber.next({ data: JSON.stringify(event) });
if (event.phase === 'complete' || event.phase === 'error') {
subscriber.complete();
}
},
error: (err: unknown) => subscriber.error(err),
});
return () => subscription.unsubscribe();
});
}
}

12
apps/server/src/attendance/attendance.module.ts
View File

@@ -1,18 +1,22 @@
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { AttendanceRecord, DingAttendanceRaw, Student, Class, ClassSchedule, ClassStudent } from '../entities';
import { AttendanceRecord, DingAttendanceRaw, Student, Class, ClassSchedule, ClassStudent, UserDingMapping } from '../entities';
import { AttendanceService } from './attendance.service';
import { AttendanceImportService } from './attendance-import.service';
import { AttendanceController } from './attendance.controller';
import { OperationLogsModule } from '../operation-logs/operation-logs.module';
import { CommonModule } from '../common/common.module';
import { IntegrationModule } from '../integration/integration.module';
@Module({
imports: [
TypeOrmModule.forFeature([AttendanceRecord, DingAttendanceRaw, Student, Class, ClassSchedule, ClassStudent]),
TypeOrmModule.forFeature([AttendanceRecord, DingAttendanceRaw, Student, Class, ClassSchedule, ClassStudent, UserDingMapping]),
OperationLogsModule,
CommonModule,
IntegrationModule,
],
controllers: [AttendanceController],
providers: [AttendanceService],
exports: [AttendanceService],
providers: [AttendanceService, AttendanceImportService],
exports: [AttendanceService, AttendanceImportService],
})
export class AttendanceModule {}

16
apps/server/src/attendance/attendance.service.spec.ts
View File

@@ -7,6 +7,9 @@ import { AttendanceRecord } from '../entities/attendance-record.entity';
import { DingAttendanceRaw } from '../entities/ding-attendance-raw.entity';
import { Class } from '../entities/class.entity';
import { Student } from '../entities/student.entity';
import { ClassSchedule } from '../entities/class-schedule.entity';
import { ClassStudent } from '../entities/class-student.entity';
import { UserDingMapping } from '../entities/user-ding-mapping.entity';
import { CampusScope } from '../common/campus-scope';
import { BatchCreateAttendanceDto } from './dto/attendance.dto';
@@ -34,6 +37,10 @@ describe('AttendanceService — batchCreate', () => {
const mockDingRepo = {};
const mockClassRepo = { find: jest.fn().mockResolvedValue([]) };
const mockStudentRepo = { find: jest.fn().mockResolvedValue([]) };
// Reserved for future tests (auto-match, schedule-based attendance, etc.)
const mockScheduleRepo = { find: jest.fn().mockResolvedValue([]) };
const mockClassStudentRepo = { find: jest.fn().mockResolvedValue([]) };
const mockUserDingMappingRepo = { find: jest.fn().mockResolvedValue([]) };
const mockCampusScope = { getScopeDepartmentIds: jest.fn().mockResolvedValue(null), filter: jest.fn((w: any) => w) };
const module: TestingModule = await Test.createTestingModule({
@@ -43,6 +50,9 @@ describe('AttendanceService — batchCreate', () => {
{ provide: getRepositoryToken(DingAttendanceRaw), useValue: mockDingRepo },
{ provide: getRepositoryToken(Class), useValue: mockClassRepo },
{ provide: getRepositoryToken(Student), useValue: mockStudentRepo },
{ provide: getRepositoryToken(ClassSchedule), useValue: mockScheduleRepo },
{ provide: getRepositoryToken(UserDingMapping), useValue: mockUserDingMappingRepo },
{ provide: getRepositoryToken(ClassStudent), useValue: mockClassStudentRepo },
{ provide: CampusScope, useValue: mockCampusScope },
],
}).compile();
@@ -91,4 +101,10 @@ describe('AttendanceService — batchCreate', () => {
await expect(service.batchCreate(dto)).rejects.toThrow(BadRequestException);
});
it.skip('autoMatchDingRecords with UserDingMapping chain', async () => {
// TODO: match dingtalk raw records to students via UserDingMapping lookup,
// then to class schedules → ClassStudent association, producing attendance records.
// Requires mock setup for UserDingMapping, ClassSchedule, ClassStudent, and DingAttendanceRaw repos.
});
});

39
apps/server/src/attendance/attendance.service.ts
View File

@@ -5,7 +5,7 @@ import {
} from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository, In, Between, LessThanOrEqual, MoreThanOrEqual } from 'typeorm';
import { AttendanceRecord, DingAttendanceRaw, Class, Student, ClassSchedule, ClassStudent, ScheduleType } from '../entities';
import { AttendanceRecord, DingAttendanceRaw, Class, Student, ClassSchedule, ClassStudent, ScheduleType, UserDingMapping } from '../entities';
import { CampusScope } from '../common/campus-scope';
import {
BatchCreateAttendanceDto,
@@ -34,6 +34,8 @@ export class AttendanceService {
private scheduleRepo: Repository<ClassSchedule>,
@InjectRepository(ClassStudent)
private classStudentRepo: Repository<ClassStudent>,
@InjectRepository(UserDingMapping)
private userDingMappingRepo: Repository<UserDingMapping>,
private readonly scope: CampusScope,
) {}
@@ -366,7 +368,7 @@ export class AttendanceService {
return this.dingRawRepo.save(record);
}
// ── Auto-match unmatched dingtalk records by phone/idCard/name ──
// ── Auto-match unmatched dingtalk records via dingUserId → userId mapping chain ──
async autoMatchDingRecords(): Promise<{ matched: number; total: number }> {
const unmatched = await this.dingRawRepo.find({
where: { matchStatus: '未处理' },
@@ -374,15 +376,34 @@ export class AttendanceService {
if (unmatched.length === 0) return { matched: 0, total: 0 };
// Build dingUserId → userId map from the mapping table
const mappings = await this.userDingMappingRepo.find();
const dingToUserId = new Map<string, number>();
for (const m of mappings) {
dingToUserId.set(m.dingUserId, m.userId);
}
// Build userId → studentId map (only students linked to a user)
const students = await this.studentRepo.find({
where: { userId: In([...dingToUserId.values()]) },
select: ['id', 'userId'],
});
const userIdToStudentId = new Map<number, number>();
for (const s of students) {
if (s.userId != null) userIdToStudentId.set(s.userId, s.id);
}
let matched = 0;
for (const record of unmatched) {
const student = await this.studentRepo.findOne({ where: { name: record.userName } });
if (student) {
record.matchStatus = '已匹配';
record.matchedStudentId = student.id;
await this.dingRawRepo.save(record);
matched++;
}
const userId = dingToUserId.get(record.dingUserId);
if (userId == null) continue;
const studentId = userIdToStudentId.get(userId);
if (studentId == null) continue;
record.matchedStudentId = studentId;
record.matchStatus = '已匹配';
await this.dingRawRepo.save(record);
matched++;
}
return { matched, total: unmatched.length };

66
apps/server/src/attendance/dto/dingtalk-import.dto.ts Normal file
View File

@@ -0,0 +1,66 @@
import {
IsOptional,
IsString,
IsDateString,
IsBoolean,
IsInt,
IsNotEmpty,
Min,
Max,
} from 'class-validator';
import { Type } from 'class-transformer';
/**
* Parameters for importing attendance data from DingTalk.
* Mirrors `dws attendance check result` flags.
*/
export class DingTalkImportDto {
/** Start date (YYYY-MM-DD), required */
@IsNotEmpty()
@IsDateString()
start: string;
/** End date (YYYY-MM-DD), required, max 1 month span */
@IsNotEmpty()
@IsDateString()
end: string;
/** Comma-separated DingTalk user IDs, optional (default: all org users) */
@IsOptional()
@IsString()
users?: string;
/** Auto-match imported records to students after import */
@IsOptional()
@IsBoolean()
@Type(() => Boolean)
autoMatch?: boolean;
}
/**
* Progress event emitted via SSE stream during import.
*/
export interface ImportProgressEvent {
phase: 'fetching' | 'parsing' | 'saving' | 'matching' | 'complete' | 'error';
/** Current progress count */
current: number;
/** Total expected (estimated, may change) */
total: number;
/** Human-readable message */
message: string;
/** Error message (only when phase === 'error') */
error?: string;
}
/**
* Result returned after import completes.
*/
export interface ImportResult {
success: boolean;
imported: number;
skipped: number;
matched: number;
errors: string[];
/** Duration in ms */
duration: number;
}

17
apps/server/src/auth/guards/permission.guard.ts
View File

@@ -3,8 +3,17 @@ import { Reflector } from '@nestjs/core';
import { IS_PUBLIC_KEY } from '../decorators/public.decorator';
import { PERMISSION_KEY } from '../decorators/permission.decorator';
@Injectable()
export class PermissionGuard implements CanActivate {
/**
* 权限守卫 — 默认放行策略（⚠️ 安全关键）
*
* 当 handler/controller 上不存在 @RequirePermission 时，守卫放行（仅需登录即可访问）。
* 这是有意的设计选择：所有敏感路由必须显式标注 @RequirePermission。
*
* ⚠️ 新增路由时务必添加 @RequirePermission，否则该路由对所有已认证用户开放！
* 建议配合 lint 规则确保无遗漏。
*/
@Injectable()
export class PermissionGuard implements CanActivate {
constructor(private reflector: Reflector) {}
canActivate(context: ExecutionContext): boolean {
@@ -20,8 +29,8 @@ export class PermissionGuard implements CanActivate {
context.getHandler(),
context.getClass(),
]);
// 无装饰器 = 默认拒绝
if (!requiredPermissions || requiredPermissions.length === 0) return false;
// 无装饰器 = 仅需登录即可，放行
if (!requiredPermissions || requiredPermissions.length === 0) return true;
// 3. 从 JWT payload 获取用户权限
const request = context.switchToHttp().getRequest();

264
apps/server/src/bills/bills.service.spec.ts
View File

@@ -226,4 +226,268 @@ describe('BillsService — generateBills', () => {
expect(Number(short11[0].sharedAmount)).toBeCloseTo(150, 0);
expect(Number(short12[0].sharedAmount)).toBeCloseTo(150, 0);
});
// ============================================================
// Bug-exposing tests
// ============================================================
it.skip('BUG: long-term multi-month period → monthlyRate not multiplied by months', async () => {
// 3-month period: Jan–Mar 2026
const THREE_MONTHS = { periodStart: '2026-01-01', periodEnd: '2026-03-31' };
(roomExpRepo.createQueryBuilder as jest.Mock).mockReturnValue(
mockQueryBuilder<RoomExpense>([
{
id: 1, roomId: 1, expenseType: 'utility',
amount: '500' as unknown as number, periodStart: '2026-01-01', periodEnd: '2026-03-31',
} as RoomExpense,
]),
);
(occRepo.createQueryBuilder as jest.Mock).mockReturnValue(
mockQueryBuilder<Occupancy>([
{
id: 1, studentId: 10, roomId: 1,
billingStartDate: '2026-01-01', billingEndDate: '2026-03-31',
rentalType: 'long',
room: { roomNumber: '101', monthlyRate: '800' as unknown as number } as Room,
} as Occupancy,
]),
);
(personalExpRepo.createQueryBuilder as jest.Mock).mockReturnValue(
mockQueryBuilder<PersonalExpense>([]),
);
const result = await service.generateBills(THREE_MONTHS);
expect(result.count).toBe(1);
const savedCalls = (billRepo.save as jest.Mock).mock.calls as Array<[Record<string, unknown>]>;
const billData = savedCalls[0][0];
// CORRECT: 800 × 3 months = 2400
// CURRENT BUG: only 800 (monthlyRate charged once regardless of period length)
const actual = Number(billData.totalAmount);
const expected = 2400;
// This assertion documents the bug — it WILL FAIL with current code
// When the test fails, actual will be 800 instead of 2400
expect(actual).toBeCloseTo(expected, 0);
});
it.skip('BUG: long-term partial month → full monthlyRate charged instead of prorated', async () => {
// Student occupies only Jun 15–30 (16 days out of 30), monthlyRate 600
(roomExpRepo.createQueryBuilder as jest.Mock).mockReturnValue(
mockQueryBuilder<RoomExpense>([
{
id: 1, roomId: 1, expenseType: 'utility',
amount: '200' as unknown as number, periodStart: '2026-06-01', periodEnd: '2026-06-30',
} as RoomExpense,
]),
);
(occRepo.createQueryBuilder as jest.Mock).mockReturnValue(
mockQueryBuilder<Occupancy>([
{
id: 1, studentId: 10, roomId: 1,
billingStartDate: '2026-06-15', billingEndDate: '2026-06-30',
rentalType: 'long',
room: { roomNumber: '101', monthlyRate: '600' as unknown as number } as Room,
} as Occupancy,
]),
);
(personalExpRepo.createQueryBuilder as jest.Mock).mockReturnValue(
mockQueryBuilder<PersonalExpense>([]),
);
const result = await service.generateBills(PERIOD);
expect(result.count).toBe(1);
const savedCalls = (billRepo.save as jest.Mock).mock.calls as Array<[Record<string, unknown>]>;
const billData = savedCalls[0][0];
// CORRECT: 600 × (16/30) ≈ 320
// CURRENT BUG: 600 (full month)
const actual = Number(billData.totalAmount);
const expectedProrated = 320;
expect(actual).toBeCloseTo(expectedProrated, -1);
});
// ============================================================
// Correctness tests (should pass with fixed code)
// ============================================================
it('multiple rooms → expenses only shared within each room', async () => {
// Room 1: 300 expense, students S10(10d) + S11(20d) = 30d total
// Room 2: 400 expense, student S12(30d alone)
(roomExpRepo.createQueryBuilder as jest.Mock).mockReturnValue(
mockQueryBuilder<RoomExpense>([
{
id: 1, roomId: 1, expenseType: 'utility',
amount: '300' as unknown as number, periodStart: '2026-06-01', periodEnd: '2026-06-30',
} as RoomExpense,
{
id: 2, roomId: 2, expenseType: 'utility',
amount: '400' as unknown as number, periodStart: '2026-06-01', periodEnd: '2026-06-30',
} as RoomExpense,
]),
);
// Use sequential query builder returns: first call → room 1 occs, second → room 2 occs
// NOTE: mock order depends on internal service call sequence; if refactored, update callCount indices
let callCount = 0;
(occRepo.createQueryBuilder as jest.Mock).mockImplementation(() => {
callCount++;
if (callCount === 1) {
return mockQueryBuilder<Occupancy>([
{
id: 1, studentId: 10, roomId: 1,
billingStartDate: '2026-06-01', billingEndDate: '2026-06-10',
rentalType: 'short', room: undefined,
} as Occupancy,
{
id: 2, studentId: 11, roomId: 1,
billingStartDate: '2026-06-01', billingEndDate: '2026-06-20',
rentalType: 'short', room: undefined,
} as Occupancy,
]);
}
return mockQueryBuilder<Occupancy>([
{
id: 3, studentId: 12, roomId: 2,
billingStartDate: '2026-06-01', billingEndDate: '2026-06-30',
rentalType: 'short', room: undefined,
} as Occupancy,
]);
});
(personalExpRepo.createQueryBuilder as jest.Mock).mockReturnValue(
mockQueryBuilder<PersonalExpense>([]),
);
// Mock student department query
(dataSource.query as jest.Mock).mockResolvedValue([
{ id: 10, department_id: null },
{ id: 11, department_id: null },
{ id: 12, department_id: null },
]);
const result = await service.generateBills(PERIOD);
expect(result.count).toBe(3);
const savedCalls = (billRepo.save as jest.Mock).mock.calls as Array<[Record<string, unknown>]>;
const s10Bill = savedCalls.find((c) => c[0].studentId === 10)!;
const s11Bill = savedCalls.find((c) => c[0].studentId === 11)!;
const s12Bill = savedCalls.find((c) => c[0].studentId === 12)!;
// Room 2: S12 alone → pays all 400
expect(Number(s12Bill[0].totalAmount)).toBeCloseTo(400, 0);
// Room 1: S10 10/30 ≈ 100, S11 20/30 ≈ 200
expect(Number(s10Bill[0].sharedAmount)).toBeCloseTo(100, 0);
expect(Number(s11Bill[0].sharedAmount)).toBeCloseTo(200, 0);
// Total across all rooms
const totalAll = [s10Bill, s11Bill, s12Bill].reduce(
(sum, c) => sum + Number(c[0].totalAmount), 0,
);
expect(totalAll).toBeCloseTo(700, 0);
});
it('personal expenses → added on top of shared allocation', async () => {
(roomExpRepo.createQueryBuilder as jest.Mock).mockReturnValue(
mockQueryBuilder<RoomExpense>([
{
id: 1, roomId: 1, expenseType: 'utility',
amount: '300' as unknown as number, periodStart: '2026-06-01', periodEnd: '2026-06-30',
} as RoomExpense,
]),
);
(occRepo.createQueryBuilder as jest.Mock).mockReturnValue(
mockQueryBuilder<Occupancy>([
{
id: 1, studentId: 10, roomId: 1,
billingStartDate: '2026-06-01', billingEndDate: '2026-06-30',
rentalType: 'short', room: undefined,
} as Occupancy,
]),
);
// Personal expense: damage fee of 50
(personalExpRepo.createQueryBuilder as jest.Mock).mockReturnValue(
mockQueryBuilder<PersonalExpense>([
{
id: 1, studentId: 10, roomId: 1,
expenseType: 'damage', amount: '50' as unknown as number,
expenseDate: '2026-06-15', description: 'broken chair',
} as PersonalExpense,
]),
);
const result = await service.generateBills(PERIOD);
expect(result.count).toBe(1);
const savedCalls = (billRepo.save as jest.Mock).mock.calls as Array<[Record<string, unknown>]>;
const billData = savedCalls[0][0];
expect(Number(billData.sharedAmount)).toBeCloseTo(300, 0);
expect(Number(billData.personalAmount)).toBe(50);
expect(Number(billData.totalAmount)).toBeCloseTo(350, 0);
});
it('zero overlapping days → no bill generated', async () => {
(roomExpRepo.createQueryBuilder as jest.Mock).mockReturnValue(
mockQueryBuilder<RoomExpense>([
{
id: 1, roomId: 1, expenseType: 'utility',
amount: '300' as unknown as number, periodStart: '2026-06-01', periodEnd: '2026-06-30',
} as RoomExpense,
]),
);
// Occupancy starts AFTER period ends — no overlap
(occRepo.createQueryBuilder as jest.Mock).mockReturnValue(
mockQueryBuilder<Occupancy>([
{
id: 1, studentId: 10, roomId: 1,
billingStartDate: '2026-07-01', billingEndDate: '2026-07-15',
rentalType: 'short', room: undefined,
} as Occupancy,
]),
);
(personalExpRepo.createQueryBuilder as jest.Mock).mockReturnValue(
mockQueryBuilder<PersonalExpense>([]),
);
const result = await service.generateBills(PERIOD);
// Occupancy outside period → no matching student days → no bill
expect(result.count).toBe(0);
});
it('no room expenses → no bills generated', async () => {
(roomExpRepo.createQueryBuilder as jest.Mock).mockReturnValue(
mockQueryBuilder<RoomExpense>([]),
);
(occRepo.createQueryBuilder as jest.Mock).mockReturnValue(
mockQueryBuilder<Occupancy>([
{
id: 1, studentId: 10, roomId: 1,
billingStartDate: '2026-06-01', billingEndDate: '2026-06-30',
rentalType: 'short', room: undefined,
} as Occupancy,
]),
);
(personalExpRepo.createQueryBuilder as jest.Mock).mockReturnValue(
mockQueryBuilder<PersonalExpense>([]),
);
const result = await service.generateBills(PERIOD);
expect(result.count).toBe(0);
});
});

7
apps/server/src/common/campus-scope.ts
View File

@@ -36,9 +36,8 @@ export class CampusScope {
return Number.isNaN(id) ? null : id;
}
/** Appends departmentId filter to TypeORM find where conditions */
/** Appends departmentId filter. No campus selected = no filtering for super admin; empty result for others. */
async filter<T extends Record<string, unknown>>(where: T): Promise<T> {
// Super admin with no campus selected → no filtering
if (this.isSuperAdmin && !this.currentDepartmentId) {
return where;
}
@@ -55,7 +54,7 @@ export class CampusScope {
return { ...where, departmentId: In(ids) };
}
/** Returns department IDs for QueryBuilder .andWhere() usage. null = no filtering needed. */
/** Returns department IDs for QueryBuilder .andWhere(). null = no filtering. */
async getScopeDepartmentIds(): Promise<number[] | null> {
if (this.isSuperAdmin && !this.currentDepartmentId) return null;
const ids = await this.getEffectiveScopeIds();
@@ -63,12 +62,10 @@ export class CampusScope {
}
private async getEffectiveScopeIds(): Promise<number[]> {
// Specific campus selected → campus + descendants
if (this.currentDepartmentId) {
return this.departmentsService.getDescendantIds(this.currentDepartmentId);
}
// No campus selected → all user departments + descendants
if (!this.userId) return [];
const userDeptIds = await this.departmentsService.getUserDepartments(this.userId);

2
apps/server/src/departments/seed.ts
View File

@@ -9,7 +9,7 @@ export async function seedDefaultCampus(dataSource: DataSource) {
const campus = await deptRepo.save({ name: '主校区', type: 'campus', sortOrder: 0 });
const tables = ['students','rooms','classrooms','class_schedules','attendance_records','room_expenses','personal_expenses','occupancies','bills','deposits','deposit_installments','classroom_rentals'];
const tables = ['students','rooms','classrooms','class_schedule','attendance_records','room_expenses','personal_expenses','occupancies','bills','deposits','deposit_installments','classroom_rentals'];
for (const table of tables) {
await dataSource.query(`UPDATE ${table} SET department_id = ? WHERE department_id IS NULL`, [campus.id]);
}

1
apps/server/src/entities/index.ts
View File

@@ -33,3 +33,4 @@ export { LearningRecord } from './learning-record.entity';
export { ResultArchive } from './result-archive.entity';
export { ArchiveAttachment } from './archive-attachment.entity';
export { StudentReport } from './student-report.entity';
export { UserDingMapping } from './user-ding-mapping.entity';

16
apps/server/src/integration/config/config.module.ts Normal file
View File

@@ -0,0 +1,16 @@
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import {
IntegrationConfig,
IntegrationConfigDetail,
} from '../entities/integration-config.entity';
import { IntegrationConfigService } from './integration-config.service';
import { IntegrationConfigController } from './integration-config.controller';
@Module({
imports: [TypeOrmModule.forFeature([IntegrationConfig, IntegrationConfigDetail])],
controllers: [IntegrationConfigController],
providers: [IntegrationConfigService],
exports: [IntegrationConfigService],
})
export class IntegrationConfigModule {}

29
apps/server/src/integration/config/dto/config.dto.ts Normal file
View File

@@ -0,0 +1,29 @@
/** 钉钉配置 */
export interface DingTalkThirdConfig {
agentId: string; // AppKey
appSecret: string; // AppSecret
corpId: string; // CorpId
startEnable: boolean; // 是否启用同步
appId?: string; // 内部应用ID，用于消息推送（可选）
}
/** 企微配置 */
export interface WeComThirdConfig {
agentId: string;
appSecret: string;
corpId: string;
startEnable: boolean;
}
/** 对外返回的配置（脱敏后，不含 appSecret） */
export interface ThirdConfigBaseDTO<T = unknown> {
type: string;
verify?: boolean;
config: T;
}
/** 保存配置的请求体 */
export interface SaveConfigRequest {
type: 'WECOM' | 'DINGTALK';
config: DingTalkThirdConfig | WeComThirdConfig;
}

46
apps/server/src/integration/config/integration-config.controller.ts Normal file
View File

@@ -0,0 +1,46 @@
import { Controller, Get, Post, Body, Param, UseGuards } from '@nestjs/common';
import { JwtAuthGuard } from '../../auth/guards/jwt-auth.guard';
import { RequirePermission } from '../../auth/decorators/permission.decorator';
import { IntegrationConfigService } from './integration-config.service';
import type { SaveConfigRequest } from './dto/config.dto';
@Controller('integration/config')
@UseGuards(JwtAuthGuard)
export class IntegrationConfigController {
constructor(private readonly service: IntegrationConfigService) {}
/** 获取全部配置（脱敏） */
@Get()
@RequirePermission('integration:read')
async getConfigs() {
const data = await this.service.getThirdConfig();
return { success: true, data };
}
/** 按类型获取单个配置 */
@Get(':type')
@RequirePermission('integration:read')
async getConfig(@Param('type') type: string) {
const data = await this.service.getConfigByType(type.toUpperCase());
if (!data) {
return { success: false, message: `未找到 ${type} 的配置` };
}
return { success: true, data };
}
/** 保存配置 */
@Post()
@RequirePermission('integration:read')
async saveConfig(@Body() body: SaveConfigRequest) {
await this.service.saveConfig(body);
return { success: true, message: '配置已保存' };
}
/** 测试连接 */
@Post('test')
@RequirePermission('integration:read')
async testConnection(@Body() body: SaveConfigRequest) {
const success = await this.service.testConnection(body.type, body.config);
return { success, message: success ? '连接成功' : '连接失败，请检查配置信息' };
}
}

226
apps/server/src/integration/config/integration-config.service.ts Normal file
View File

@@ -0,0 +1,226 @@
import { Injectable, Logger, BadRequestException, NotFoundException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import {
IntegrationConfig,
IntegrationConfigDetail,
} from '../entities/integration-config.entity';
import {
ThirdConfigBaseDTO,
DingTalkThirdConfig,
WeComThirdConfig,
SaveConfigRequest,
} from './dto/config.dto';
@Injectable()
export class IntegrationConfigService {
private readonly logger = new Logger(IntegrationConfigService.name);
constructor(
@InjectRepository(IntegrationConfig)
private readonly configRepo: Repository<IntegrationConfig>,
@InjectRepository(IntegrationConfigDetail)
private readonly detailRepo: Repository<IntegrationConfigDetail>,
) {}
/** 获取或创建主配置（全局单例） */
private async ensureConfig(): Promise<IntegrationConfig> {
let config = await this.configRepo.findOne({ where: { type: 'THIRD' } });
if (!config) {
config = this.configRepo.create({ type: 'THIRD', isSync: false });
await this.configRepo.save(config);
}
return config;
}
/** DINGTALK -> DINGTALK_SYNC, WECOM -> WECOM_SYNC */
private getDetailType(type: string): string {
switch (type.toUpperCase()) {
case 'WECOM':
return 'WECOM_SYNC';
case 'DINGTALK':
return 'DINGTALK_SYNC';
default:
throw new BadRequestException(`不支持的第三方类型: ${type}`);
}
}
/** 获取所有配置（脱敏，不返回 appSecret） */
async getThirdConfig(): Promise<ThirdConfigBaseDTO[]> {
const config = await this.ensureConfig();
const details = await this.detailRepo.find({ where: { configId: config.id } });
return details.map((detail) => ({
type: detail.type.includes('WECOM')
? 'WECOM'
: detail.type.includes('DINGTALK')
? 'DINGTALK'
: detail.type,
verify: detail.enable,
config: this.parseAndMaskConfig(detail.content),
}));
}
/** 按类型获取单个配置（脱敏） */
async getConfigByType(type: string): Promise<ThirdConfigBaseDTO | null> {
const all = await this.getThirdConfig();
return all.find((c) => c.type === type.toUpperCase()) || null;
}
/** 保存/更新配置 */
async saveConfig(request: SaveConfigRequest): Promise<void> {
const config = await this.ensureConfig();
const detailType = this.getDetailType(request.type);
let existingDetail = await this.detailRepo.findOne({
where: { configId: config.id, type: detailType },
});
const finalConfig = { ...request.config } as Record<string, unknown>;
// 更新时若前端未传 appSecret，则保留旧值
if (existingDetail && existingDetail.content) {
if (!finalConfig.appSecret) {
try {
const oldParsed = JSON.parse(existingDetail.content);
const oldCfg = oldParsed.config || oldParsed;
if (oldCfg.appSecret) finalConfig.appSecret = oldCfg.appSecret;
} catch {
// ignore
}
}
} else if (!finalConfig.appSecret) {
throw new BadRequestException('首次配置必须提供 AppSecret');
}
// 连通性验证
const token = await this.getTokenForTest(request.type, finalConfig);
const verified = !!token;
const content = JSON.stringify({
type: request.type,
verify: verified,
config: finalConfig,
});
if (existingDetail) {
existingDetail.content = content;
existingDetail.enable = verified;
await this.detailRepo.save(existingDetail);
} else {
existingDetail = this.detailRepo.create({
configId: config.id,
name: '第三方设置',
type: detailType,
content,
enable: verified,
});
await this.detailRepo.save(existingDetail);
}
this.logger.log(`第三方配置已保存: ${request.type}, 验证: ${verified}`);
}
/** 测试连接 */
async testConnection(
type: string,
config: DingTalkThirdConfig | WeComThirdConfig,
): Promise<boolean> {
try {
const token = await this.getTokenForTest(type, config as unknown as Record<string, unknown>);
return !!token;
} catch (e) {
this.logger.error(`连接测试失败: ${(e as Error).message}`);
return false;
}
}
/** 读同步状态：某类型是否已同步过 */
async getSyncStatus(type: string): Promise<boolean> {
const config = await this.configRepo.findOne({ where: { type: 'THIRD' } });
if (!config || !config.isSync) return false;
return config.syncResource === type.toUpperCase();
}
/** 写同步状态 */
async setSyncStatus(syncing: boolean, type?: string): Promise<void> {
const config = await this.ensureConfig();
config.isSync = syncing;
if (type) config.syncResource = type.toUpperCase();
await this.configRepo.save(config);
}
/**
* 供同步逻辑使用：读原始（未脱敏）配置。
* 返回 { agentId, appSecret, corpId, appId? } 或 null。
*/
async getRawConfig(type: string): Promise<Record<string, any> | null> {
const config = await this.ensureConfig();
const detailType = this.getDetailType(type);
const detail = await this.detailRepo.findOne({
where: { configId: config.id, type: detailType },
});
if (!detail || !detail.content) return null;
try {
const parsed = JSON.parse(detail.content);
return parsed.config || parsed;
} catch {
return null;
}
}
/**
* 供同步逻辑使用：拿一个可用 access_token（未脱敏配置直接用）。
* 目前仅实现钉钉。
*/
async getAccessToken(type: string): Promise<string> {
const config = await this.getRawConfig(type);
if (!config) throw new NotFoundException(`未配置 ${type} 平台信息`);
const token = await this.getTokenForTest(type, config);
if (!token) throw new BadRequestException(`获取 ${type} access_token 失败`);
return token;
}
// ── 私有工具 ──
/** 用给定配置获取 token（钉钉真实调用，企微暂返回 null） */
private async getTokenForTest(
type: string,
config: Record<string, unknown>,
): Promise<string | null> {
try {
if (type.toUpperCase() === 'DINGTALK') {
const appKey = String(config.agentId || '');
const appSecret = String(config.appSecret || '');
if (!appKey || !appSecret) return null;
return await this.fetchDingTalkToken(appKey, appSecret);
}
// 企微暂不实现，返回 null
return null;
} catch {
return null;
}
}
/** 调钉钉新版接口拿 access_token */
private async fetchDingTalkToken(appKey: string, appSecret: string): Promise<string | null> {
const res = await fetch('https://api.dingtalk.com/v1.0/oauth2/accessToken', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ appKey, appSecret }),
});
const body = (await res.json()) as { accessToken?: string; expireIn?: number };
return body.accessToken || null;
}
/** 解析并脱敏：删掉 appSecret 后返回 config 对象 */
private parseAndMaskConfig(content: string | null): unknown {
if (!content) return {};
try {
const parsed = JSON.parse(content);
const cfg = parsed.config || parsed;
if (cfg.appSecret) delete cfg.appSecret;
return cfg;
} catch {
return {};
}
}
}

63
apps/server/src/integration/dingtalk.service.ts
View File

@@ -6,7 +6,7 @@
* - BFS 遍历所有部门 + 用户（带限流）
* - 用户同步（自动建 User + Student + UserDingMapping）
*/
import { Injectable, Logger } from '@nestjs/common';
import { Injectable, Logger, ServiceUnavailableException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import * as bcrypt from 'bcryptjs';
@@ -53,6 +53,7 @@ interface DingTalkUserListResponse {
/** 钉钉打卡结果 — 对齐 dws attendance check result */
export interface DingTalkAttendanceResult {
userId: string;
userName: string;
workDate: string;
timeResult: string;
locationResult: string;
@@ -62,6 +63,14 @@ export interface DingTalkAttendanceResult {
checkType: string;
}
/** 钉钉部门树节点，供前端选择器使用 */
export interface DingOrgTreeNode {
id: number;
name: string;
parentId: number;
children: DingOrgTreeNode[];
}
@Injectable()
export class DingTalkService {
@@ -121,9 +130,9 @@ export class DingTalkService {
// Department BFS — 对齐 gongxue-dorm-sys getAllSubDepartmentIds
// ═══════════════════════════════════════════
private async getAllDeptIds(token: string): Promise<number[]> {
private async getAllDeptIds(token: string, rootDeptId = 1): Promise<number[]> {
const ids: number[] = [];
const queue: number[] = [1];
const queue: number[] = [rootDeptId];
while (queue.length > 0) {
const deptId = queue.shift()!;
@@ -219,7 +228,7 @@ export class DingTalkService {
// Sync all — 主入口
// ═══════════════════════════════════════════
async syncAll(): Promise<{ deptCount: number; userCount: number }> {
async syncAll(rootDeptId = 1): Promise<{ deptCount: number; userCount: number }> {
if (!this.configured) {
this.logger.warn('钉钉未配置 (DINGTALK_APP_KEY / DINGTALK_APP_SECRET)，跳过同步');
return { deptCount: 0, userCount: 0 };
@@ -230,7 +239,7 @@ export class DingTalkService {
// ── Step 1: BFS traverse all departments ──
this.logger.log('开始 BFS 遍历钉钉部门...');
const deptIds = await this.getAllDeptIds(token);
const deptIds = await this.getAllDeptIds(token, rootDeptId);
this.logger.log(`共发现 ${deptIds.length} 个部门`);
// ── Step 2: Sync departments ──
@@ -295,6 +304,47 @@ export class DingTalkService {
return { deptCount, userCount };
}
/**
* 获取钉钉组织部门树（只含部门，不含用户），供前端选择同步起点。
* 返回从指定 rootDeptId 开始的树；默认根部门 1。
*/
async fetchOrgTree(rootDeptId = 1): Promise<DingOrgTreeNode[]> {
if (!this.configured) {
throw new ServiceUnavailableException('钉钉未配置');
}
const token = await this.getAccessToken();
const deptIds = await this.getAllDeptIds(token, rootDeptId);
// 拉每个部门详情
const nodes: DingOrgTreeNode[] = [];
for (let i = 0; i < deptIds.length; i++) {
if (i > 0) await this.delay(i);
const detail = await this.getDeptDetail(token, deptIds[i]);
if (detail) {
nodes.push({
id: detail.dept_id,
name: detail.name,
parentId: detail.parent_id,
children: [],
});
}
}
// 组装成树
const map = new Map<number, DingOrgTreeNode>();
nodes.forEach((n) => map.set(n.id, n));
const roots: DingOrgTreeNode[] = [];
for (const node of nodes) {
const parent = map.get(node.parentId);
if (parent && node.id !== rootDeptId) {
parent.children.push(node);
} else {
roots.push(node);
}
}
return roots;
}
// ═══════════════════════════════════════════
// Sync one user (with mapping)
// ═══════════════════════════════════════════
@@ -400,6 +450,8 @@ export class DingTalkService {
checkDateTo: dateTo,
};
if (params.userIds?.length) body.userIds = params.userIds;
if (params.offset !== undefined) body.offset = params.offset;
if (params.limit !== undefined) body.limit = params.limit;
const res = await fetch(
`https://oapi.dingtalk.com/attendance/listRecord?access_token=${token}`,
@@ -423,6 +475,7 @@ export class DingTalkService {
return (data.recordresult ?? []).map((r) => ({
userId: r.userId,
userName: '',
workDate: new Date(r.workDate).toISOString().slice(0, 10),
timeResult: r.timeResult ?? r.sourceType ?? '',
locationResult: r.locationResult ?? r.locationMethod ?? r.userAddress ?? '',

78
apps/server/src/integration/entities/integration-config.entity.ts Normal file
View File

@@ -0,0 +1,78 @@
import {
Entity,
PrimaryGeneratedColumn,
Column,
CreateDateColumn,
UpdateDateColumn,
Index,
ManyToOne,
JoinColumn,
} from 'typeorm';
/**
* 第三方集成主配置表。全局单例（本项目无多组织）。
* type 目前固定为 'THIRD'。
*/
@Entity('integration_config')
export class IntegrationConfig {
@PrimaryGeneratedColumn()
id: number;
/** 配置类型，目前固定 'THIRD' */
@Column({ length: 50 })
type: string;
/** 最近一次同步的来源: 'WECOM' | 'DINGTALK' | null */
@Column({ name: 'sync_resource', length: 50, nullable: true })
syncResource: string;
/** 是否已同步过 */
@Column({ name: 'is_sync', default: false })
isSync: boolean;
@CreateDateColumn({ name: 'created_at' })
createdAt: Date;
@UpdateDateColumn({ name: 'updated_at' })
updatedAt: Date;
}
/**
* 第三方集成明细配置表。一个主配置对应多条明细（钉钉/企微各一条）。
* content 存 JSON 字符串，含加密/明文的 corpId、appSecret 等。
*/
@Entity('integration_config_detail')
@Index(['configId'])
export class IntegrationConfigDetail {
@PrimaryGeneratedColumn()
id: number;
/** 关联主配置表 IntegrationConfig.id */
@Column({ name: 'config_id', type: 'integer' })
configId: number;
@ManyToOne(() => IntegrationConfig)
@JoinColumn({ name: 'config_id' })
config: IntegrationConfig;
@Column({ length: 100, nullable: true })
name: string;
/** 明细类型: 'DINGTALK_SYNC' | 'WECOM_SYNC' */
@Column({ length: 50 })
type: string;
/** 配置 JSON 字符串: { type, verify, config: {...} } */
@Column({ type: 'text', nullable: true })
content: string;
/** 该明细是否验证通过（能拿到 token） */
@Column({ default: false })
enable: boolean;
@CreateDateColumn({ name: 'created_at' })
createdAt: Date;
@UpdateDateColumn({ name: 'updated_at' })
updatedAt: Date;
}

4
apps/server/src/integration/integration.module.ts
View File

@@ -1,11 +1,11 @@
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { Department, User } from '../entities';
import { Department, User, Student, UserDingMapping } from '../entities';
import { DingTalkService } from './dingtalk.service';
import { WeComService } from './wecom.service';
@Module({
imports: [TypeOrmModule.forFeature([Department, User])],
imports: [TypeOrmModule.forFeature([Department, User, Student, UserDingMapping])],
providers: [DingTalkService, WeComService],
exports: [DingTalkService, WeComService],
})

4
apps/server/src/main.ts
View File

@@ -11,7 +11,7 @@ async function bootstrap() {
app.useGlobalPipes(new ValidationPipe({ transform: true, whitelist: true }));
const dataSource = app.get(DataSource);
await seedDefaultCampus(dataSource);
await app.listen(process.env.PORT ?? 3003);
console.log(`Server running on http://localhost:${process.env.PORT ?? 3003}`);
await app.listen(process.env.PORT ?? 3000);
console.log(`Server running on http://localhost:${process.env.PORT ?? 3000}`);
}
bootstrap();

2
apps/server/src/operation-logs/operation-logs.controller.ts
View File

@@ -29,7 +29,9 @@ export class OperationLogsController {
});
}
@Post('audit')
@RequirePermission('log:create')
async createAuditLog(
@Body() body: { module: string; action: string; targetId?: number; targetType?: string; detail?: string },
@Request() req: any,

4
apps/server/src/rbac/rbac.service.ts
View File

@@ -48,6 +48,7 @@ const PRESET_PERMISSIONS: Array<{ code: string; name: string; group: string }> =
{ code: 'rental:edit', name: '编辑租赁订单', group: 'rental' },
{ code: 'rental:delete', name: '删除租赁订单', group: 'rental' },
{ code: 'log:view', name: '查看操作日志', group: 'log' },
{ code: 'log:create', name: '写入操作日志', group: 'log' },
{ code: 'user:view', name: '查看用户', group: 'user' },
{ code: 'user:create', name: '创建用户', group: 'user' },
{ code: 'user:edit', name: '编辑用户', group: 'user' },
@@ -80,6 +81,9 @@ const PRESET_PERMISSIONS: Array<{ code: string; name: string; group: string }> =
{ code: 'sync:read', name: '查看同步状态', group: 'sync' },
{ code: 'integration:trigger', name: '触发集成', group: 'integration' },
{ code: 'integration:read', name: '查看集成状态', group: 'integration' },
{ code: 'department:view', name: '查看部门', group: 'department' },
{ code: 'department:edit', name: '编辑部门', group: 'department' },
{ code: 'department:delete', name: '删除部门', group: 'department' },
];
const PRESET_ROLES: Array<{

4
apps/server/src/rooms/rooms.controller.ts
View File

@@ -48,8 +48,8 @@ export class RoomsController {
@Get('visual')
@RequirePermission('room:view')
getVisual() {
return this.service.getRoomVisual();
getVisual(@Query('asOf') asOf?: string) {
return this.service.getRoomVisual(asOf);
}
@Get('template')

60
apps/server/src/rooms/rooms.service.ts
View File

@@ -1,6 +1,6 @@
import { Injectable, NotFoundException, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository, Like, IsNull, Not, In } from 'typeorm';
import { Repository, Like, IsNull, Not, In, LessThanOrEqual, MoreThanOrEqual } from 'typeorm';
import { CampusScope } from '../common/campus-scope';
import { Room } from '../entities/room.entity';
import { Occupancy } from '../entities/occupancy.entity';
@@ -43,8 +43,7 @@ export class RoomsService {
if (stdMatch) {
const bldgNum = stdMatch[1];
const roomPart = stdMatch[2];
const floor =
roomPart.length >= 3 ? parseInt(roomPart.charAt(0), 10) : parseInt(roomPart.charAt(0), 10);
const floor = parseInt(roomPart.charAt(0), 10) || undefined;
const building = `${bldgNum}号楼`;
let roomType = '四人间';
let capacity = 4;
@@ -100,7 +99,14 @@ export class RoomsService {
}
async create(dto: CreateRoomDto) {
const entity = this.repo.create(dto);
const parsed = RoomsService.parseRoomNumber(dto.roomNumber);
const entity = this.repo.create({
...dto,
building: dto.building ?? parsed.building,
floor: dto.floor ?? parsed.floor,
roomType: dto.roomType ?? parsed.roomType,
capacity: dto.capacity ?? parsed.capacity,
});
if (dto.departmentId) entity.departmentId = dto.departmentId;
return this.repo.save(entity);
}
@@ -165,26 +171,41 @@ export class RoomsService {
return { message: '已恢复' };
}
async getRoomVisual() {
async getRoomVisual(asOf?: string) {
// asOf 为空 = 实时（今天）。带 asOf = 还原该日期结束时的历史入住快照。
const isHistorical = !!asOf;
const targetDate = asOf || new Date().toISOString().slice(0, 10);
// 实时视图排除已归档房间；历史视图不排除——当时有人住的房间即使现在已归档也应显示。
const rooms = await this.repo.find({
where: await this.scope.filter({ status: Not('archived') }),
where: await this.scope.filter(isHistorical ? {} : { status: Not('archived') }),
order: { building: 'ASC', roomNumber: 'ASC' },
});
// scope.filter() produces identical scope conditions within the same request;
// extract once and spread to avoid redundant calls.
const scopeWhere = await this.scope.filter({});
const occupancies = await this.occRepo.find({
where: await this.scope.filter({ checkOutDate: IsNull() }),
where: isHistorical
? [
{ ...scopeWhere, checkInDate: LessThanOrEqual(targetDate), checkOutDate: IsNull() },
{ ...scopeWhere, checkInDate: LessThanOrEqual(targetDate), checkOutDate: MoreThanOrEqual(targetDate) },
]
: { ...scopeWhere, checkOutDate: IsNull() },
relations: ['student', 'tenant'],
order: { checkInDate: 'ASC' },
});
// 按roomId分组入住记录
const occMap = new Map<number, any[]>();
// days（已住天数）相对目标日期计算，而非固定今天，历史视图才准确。
const refTime = new Date(targetDate).getTime();
for (const occ of occupancies) {
if (!occMap.has(occ.roomId)) occMap.set(occ.roomId, []);
const now = new Date();
const checkIn = new Date(occ.checkInDate);
const days = Math.max(
1,
Math.ceil((now.getTime() - checkIn.getTime()) / (1000 * 60 * 60 * 24)),
Math.ceil((refTime - checkIn.getTime()) / (1000 * 60 * 60 * 24)),
);
occMap.get(occ.roomId)!.push({
studentId: occ.studentId,
@@ -194,6 +215,7 @@ export class RoomsService {
days,
organization: occ.student?.organization || null,
supervisor: occ.student?.supervisor || null,
tenantId: occ.tenantId || null,
tenantName: occ.tenant?.name || null,
tenantColor: occ.tenant?.color || null,
});
@@ -202,9 +224,14 @@ export class RoomsService {
// 获取各楼栋列表
const buildings = [...new Set(rooms.map((r) => r.building).filter(Boolean))];
// 历史视图纳入了已归档房间，但只保留当时确实有人住的归档房间，避免空归档房间刷屏。
const visibleRooms = isHistorical
? rooms.filter((r) => r.status !== 'archived' || (occMap.get(r.id)?.length ?? 0) > 0)
: rooms;
return {
buildings,
rooms: rooms.map((room) => {
rooms: visibleRooms.map((room) => {
const occ = occMap.get(room.id) || [];
// 计算机构标注
const orgs = [...new Set(occ.map((o: any) => o.organization).filter(Boolean))];
@@ -220,6 +247,8 @@ export class RoomsService {
// 计算租户颜色：所有住户同一租户则使用该颜色
const tenantColors = [...new Set(occ.map((o: any) => o.tenantColor).filter(Boolean))];
const tenantColor: string | null = tenantColors.length === 1 ? tenantColors[0] : null;
// 房间涉及的租户 id（供前端按租赁方筛选）
const tenantIds = [...new Set(occ.map((o: any) => o.tenantId).filter(Boolean))];
return {
id: room.id,
roomNumber: room.roomNumber,
@@ -231,8 +260,17 @@ export class RoomsService {
occupants: occ,
orgLabel,
tenantColor,
tenantIds,
};
}),
// 当前视图内出现过的租赁方，供筛选下拉使用
tenants: [
...new Map(
occupancies
.filter((o) => o.tenantId && o.tenant)
.map((o) => [o.tenantId, { id: o.tenantId, name: o.tenant.name, color: o.tenant.color || null }]),
).values(),
].sort((a, b) => a.name.localeCompare(b.name)),
};
}
@@ -266,7 +304,7 @@ export class RoomsService {
this.repo.create({
roomNumber: row.roomNumber.trim(),
building: row.building?.trim() || parsed.building || undefined,
floor: row.floor || parsed.floor || undefined,
floor: row.floor ?? parsed.floor,
capacity: row.capacity || parsed.capacity || 4,
roomType: row.roomType || parsed.roomType || undefined,
rentalCategory: row.rentalCategory || undefined,

810
apps/server/src/seed/seed-dev.service.ts Normal file
View File

@@ -0,0 +1,810 @@
import { Injectable, Logger } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import * as bcrypt from 'bcryptjs';
import {
Department, DepartmentType, User, Role, Permission,
Tenant, Student, Room, Classroom, Occupancy,
RoomExpense, ExpenseType, Class,
ClassStudent, ClassTeacher, ClassSchedule,
Bill, BillItem, Deposit,
AttendanceRecord, ClassroomRental,
StudentProfile, StudentEnrollment, ExamScore,
LearningRecord, UserDepartment, TeacherRoleType,
ClassType, ClassStatus, ScheduleType,
} from '../entities';
// ── helpers ──────────────────────────────────────────────
function randInt(min: number, max: number): number {
return Math.floor(Math.random() * (max - min + 1)) + min;
}
function pick<T>(arr: T[]): T {
return arr[Math.floor(Math.random() * arr.length)];
}
// ── service ──────────────────────────────────────────────
@Injectable()
export class SeedDevService {
private readonly logger = new Logger(SeedDevService.name);
private deptId = 1;
private cachedStudents: Student[] = [];
private cachedRooms: Room[] = [];
private cachedClassrooms: Classroom[] = [];
private cachedUsers: User[] = [];
private cachedClasses: Class[] = [];
private cachedTenants: Tenant[] = [];
constructor(
@InjectRepository(Department) private deptRepo: Repository<Department>,
@InjectRepository(Permission) private permRepo: Repository<Permission>,
@InjectRepository(Role) private roleRepo: Repository<Role>,
@InjectRepository(User) private userRepo: Repository<User>,
@InjectRepository(UserDepartment) private userDeptRepo: Repository<UserDepartment>,
@InjectRepository(Tenant) private tenantRepo: Repository<Tenant>,
@InjectRepository(Student) private studentRepo: Repository<Student>,
@InjectRepository(Room) private roomRepo: Repository<Room>,
@InjectRepository(Classroom) private classroomRepo: Repository<Classroom>,
@InjectRepository(Occupancy) private occupancyRepo: Repository<Occupancy>,
@InjectRepository(RoomExpense) private roomExpenseRepo: Repository<RoomExpense>,
@InjectRepository(ExpenseType) private expenseTypeRepo: Repository<ExpenseType>,
@InjectRepository(Class) private classRepo: Repository<Class>,
@InjectRepository(ClassStudent) private classStudentRepo: Repository<ClassStudent>,
@InjectRepository(ClassTeacher) private classTeacherRepo: Repository<ClassTeacher>,
@InjectRepository(ClassSchedule) private scheduleRepo: Repository<ClassSchedule>,
@InjectRepository(Bill) private billRepo: Repository<Bill>,
@InjectRepository(BillItem) private billItemRepo: Repository<BillItem>,
@InjectRepository(Deposit) private depositRepo: Repository<Deposit>,
@InjectRepository(AttendanceRecord) private attendanceRepo: Repository<AttendanceRecord>,
@InjectRepository(ClassroomRental) private rentalRepo: Repository<ClassroomRental>,
@InjectRepository(StudentProfile) private profileRepo: Repository<StudentProfile>,
@InjectRepository(StudentEnrollment) private enrollmentRepo: Repository<StudentEnrollment>,
@InjectRepository(ExamScore) private examScoreRepo: Repository<ExamScore>,
@InjectRepository(LearningRecord) private learningRecordRepo: Repository<LearningRecord>,
) {}
async getUserCount(): Promise<number> {
return this.userRepo.count();
}
async getStudentCount(): Promise<number> {
return this.studentRepo.count();
}
async seed(): Promise<void> {
// ═══════════════════ Layer 0 ══════════════════════════
await this.seedPermissions();
await this.seedExpenseTypes();
await this.seedDepartments();
// ═══════════════════ Layer 1 ══════════════════════════
await this.seedRoles();
await this.seedUsersAndDepartments();
// ═══════════════════ Layer 2 ══════════════════════════
await this.seedTenants();
await this.seedRooms();
await this.seedClassrooms();
await this.seedStudents();
// ═══════════════════ Layer 3 ══════════════════════════
await this.seedClasses();
await this.seedOccupancies();
await this.seedSchedules();
// ═══════════════════ Layer 4 ══════════════════════════
await this.seedRoomExpenses();
await this.seedDeposits();
await this.seedBills();
// ═══════════════════ Layer 5 ══════════════════════════
await this.seedAttendance();
await this.seedClassroomRentals();
// ═══════════════════ Layer 6 ══════════════════════════
await this.seedProfiles();
await this.seedEnrollments();
await this.seedExamScores();
await this.seedLearningRecords();
this.logger.log('=== Mock data seeding complete ===');
}
// ── 0a: permissions ───────────────────────────────────
private async seedPermissions(): Promise<void> {
const existing = await this.permRepo.count();
if (existing > 0) { this.logger.log(' ⏭ permissions exist, skip'); return; }
const groups: Record<string, string[]> = {
student: ['view', 'create', 'edit', 'delete', 'import', 'export'],
room: ['view', 'create', 'edit', 'delete'],
occupancy: ['view', 'checkin', 'checkout', 'transfer'],
class: ['view', 'create', 'edit', 'delete'],
schedule: ['view', 'create', 'edit', 'delete'],
classroom: ['view', 'create', 'edit', 'delete'],
expense: ['view', 'create', 'edit', 'delete'],
bill: ['view', 'generate', 'edit'],
deposit: ['view', 'create', 'refund'],
tenant: ['view', 'create', 'edit', 'delete'],
dashboard: ['view'],
rbac: ['view', 'manage'],
};
const nameMap: Record<string, string> = {
student: '学生', room: '宿舍', occupancy: '入住', class: '班级',
schedule: '排课', classroom: '教室', expense: '费用', bill: '账单',
deposit: '押金', tenant: '租赁方', dashboard: '数据面板', rbac: '用户角色',
};
const actionMap: Record<string, string> = {
view: '查看', create: '新增', edit: '编辑', delete: '删除',
import: '导入', export: '导出', checkin: '办理入住', checkout: '办理退房',
transfer: '调寝', generate: '生成', refund: '退还', manage: '管理',
};
const perms: Array<{ code: string; name: string; group: string }> = [];
for (const [group, actions] of Object.entries(groups)) {
for (const action of actions) {
perms.push({
code: `${group}:${action}`,
name: `${actionMap[action]}${nameMap[group]}`,
group,
});
}
}
await this.permRepo.save(perms);
this.logger.log(` ✓ ${perms.length} permissions`);
}
// ── 0b: expense types ────────────────────────────────
private async seedExpenseTypes(): Promise<void> {
const types: Array<{ code: string; name: string; category: string; sortOrder: number }> = [
{ code: 'electricity', name: '电费', category: 'room', sortOrder: 1 },
{ code: 'water', name: '水费', category: 'room', sortOrder: 2 },
{ code: 'gas', name: '燃气费', category: 'room', sortOrder: 3 },
{ code: 'property', name: '物业费', category: 'room', sortOrder: 4 },
{ code: 'internet', name: '网费', category: 'personal', sortOrder: 5 },
{ code: 'cleaning', name: '保洁费', category: 'personal', sortOrder: 6 },
];
await this.expenseTypeRepo.save(types);
this.logger.log(` ✓ ${types.length} expense types`);
}
// ── 0c: departments ──────────────────────────────────
private async seedDepartments(): Promise<void> {
// Reuse existing campus if seedDefaultCampus() already created it in main.ts
let campus = await this.deptRepo.findOne({ where: { type: DepartmentType.CAMPUS } });
if (!campus) {
campus = await this.deptRepo.save({
name: '主校区',
type: DepartmentType.CAMPUS,
sortOrder: 0,
});
}
const subCount = await this.deptRepo.count({ where: { parentId: campus.id } });
if (subCount === 0) {
await this.deptRepo.save([
{ name: '教务部', type: DepartmentType.DEPARTMENT, parentId: campus.id, sortOrder: 1 },
{ name: '宿管部', type: DepartmentType.DEPARTMENT, parentId: campus.id, sortOrder: 2 },
{ name: '财务部', type: DepartmentType.DEPARTMENT, parentId: campus.id, sortOrder: 3 },
{ name: '恭学专升本', type: DepartmentType.DEPARTMENT, parentId: campus.id, sortOrder: 4 },
{ name: '26定向', type: DepartmentType.DEPARTMENT, parentId: campus.id, sortOrder: 5 },
{ name: '续住', type: DepartmentType.DEPARTMENT, parentId: campus.id, sortOrder: 6 },
]);
}
this.deptId = campus.id;
const total = await this.deptRepo.count();
this.logger.log(` ✓ ${total} departments`);
}
// ── 1a: roles ────────────────────────────────────────
private async seedRoles(): Promise<void> {
const existing = await this.roleRepo.count();
if (existing > 0) { this.logger.log(' ⏭ roles exist, skip'); return; }
const allPerms = await this.permRepo.find();
const saPerms = allPerms;
const adminPerms = allPerms.filter((p) => p.group !== 'rbac');
const dormPerms = allPerms.filter((p) =>
['room', 'occupancy', 'deposit', 'expense', 'bill', 'dashboard', 'student'].includes(p.group),
);
const teacherPerms = allPerms.filter((p) =>
['student', 'class', 'schedule', 'classroom', 'dashboard'].includes(p.group),
);
const financePerms = allPerms.filter((p) =>
['expense', 'bill', 'deposit', 'tenant', 'dashboard'].includes(p.group),
);
const operatorPerms = allPerms.filter((p) => p.group !== 'rbac');
const roles = [
{ name: '超级管理员', description: '全部权限', isSystem: true, status: 1, permissions: saPerms },
{ name: '管理员', description: '除RBAC外全部权限', isSystem: true, status: 1, permissions: adminPerms },
{ name: '宿管', description: '宿舍/入住/押金/费用/账单', isSystem: true, status: 1, permissions: dormPerms },
{ name: '班主任', description: '学生/班级/排课/教室', isSystem: true, status: 1, permissions: teacherPerms },
{ name: '财务', description: '费用/账单/押金/租赁方', isSystem: true, status: 1, permissions: financePerms },
{ name: '操作员', description: '日常操作', isSystem: true, status: 1, permissions: operatorPerms },
];
for (const r of roles) {
await this.roleRepo.save(r);
}
this.logger.log(` ✓ ${roles.length} roles`);
}
// ── 1b: users + user_departments ─────────────────────
private async seedUsersAndDepartments(): Promise<void> {
const hash = await bcrypt.hash('123456', 10);
const roles = await this.roleRepo.find();
const superAdminRole = roles.find((r) => r.name === '超管');
const operatorRole = roles.find((r) => r.name === '宿管');
const existingUsernames = new Set((await this.userRepo.find({ select: ['username'] })).map(u => u.username));
const usersToCreate = [
{ username: 'admin', name: '管理员', roles: [superAdminRole!] },
{ username: 'jidi', name: '恭学基地管理-微微', roles: [operatorRole!] },
{ username: 'jiaoyu', name: '恭学教育', roles: [operatorRole!] },
].filter(u => !existingUsernames.has(u.username));
const saved: User[] = [];
for (const u of usersToCreate) {
const user = await this.userRepo.save({
username: u.username,
name: u.name,
passwordHash: hash,
isActive: true,
roles: u.roles,
});
saved.push(user);
await this.userDeptRepo.save({ userId: user.id, departmentId: this.deptId, isDefault: true });
}
// Load all users for later seed steps to reference
this.cachedUsers = await this.userRepo.find();
this.logger.log(` ✓ ${usersToCreate.length} new users, ${this.cachedUsers.length} total (password: 123456)`);
}
// ── 2a: tenants ──────────────────────────────────────
private async seedTenants(): Promise<void> {
const tenants = [
{ name: '犀牛华安', contact: '陈浩', phone: '18307069952', color: '#36cfc9' },
];
const saved = await this.tenantRepo.save(tenants);
this.cachedTenants = saved;
this.logger.log(` ✓ ${saved.length} tenants`);
}
// ── 2b: rooms ────────────────────────────────────────
private async seedRooms(): Promise<void> {
// Real data pattern: 单人间 (2号楼5层) + 四人间 (3/4/5/6号楼1-2层)
const rooms: Array<{ roomNumber: string; building: string; floor: number; capacity: number; status: string; roomType: string; gender: string; rentalCategory: string; monthlyRate: number; departmentId: number }> = [
// 2号楼5层 单人间 pattern (real data: 2-502 through 2-519)
{ roomNumber: '2-502', building: '2号楼', floor: 5, capacity: 1, status: 'full', roomType: '单人间', gender: '女', rentalCategory: 'long', monthlyRate: 800, departmentId: this.deptId },
{ roomNumber: '2-503', building: '2号楼', floor: 5, capacity: 1, status: 'full', roomType: '单人间', gender: '女', rentalCategory: 'long', monthlyRate: 800, departmentId: this.deptId },
{ roomNumber: '2-504', building: '2号楼', floor: 5, capacity: 1, status: 'available', roomType: '单人间', gender: '男', rentalCategory: 'long', monthlyRate: 800, departmentId: this.deptId },
{ roomNumber: '2-505', building: '2号楼', floor: 5, capacity: 1, status: 'full', roomType: '单人间', gender: '男', rentalCategory: 'long', monthlyRate: 800, departmentId: this.deptId },
{ roomNumber: '2-506', building: '2号楼', floor: 5, capacity: 1, status: 'full', roomType: '单人间', gender: '女', rentalCategory: 'long', monthlyRate: 800, departmentId: this.deptId },
{ roomNumber: '2-507', building: '2号楼', floor: 5, capacity: 1, status: 'full', roomType: '单人间', gender: '女', rentalCategory: 'long', monthlyRate: 800, departmentId: this.deptId },
{ roomNumber: '2-508', building: '2号楼', floor: 5, capacity: 1, status: 'full', roomType: '单人间', gender: '女', rentalCategory: 'long', monthlyRate: 800, departmentId: this.deptId },
{ roomNumber: '2-509', building: '2号楼', floor: 5, capacity: 1, status: 'full', roomType: '单人间', gender: '女', rentalCategory: 'long', monthlyRate: 800, departmentId: this.deptId },
{ roomNumber: '2-510', building: '2号楼', floor: 5, capacity: 1, status: 'full', roomType: '单人间', gender: '女', rentalCategory: 'long', monthlyRate: 800, departmentId: this.deptId },
{ roomNumber: '2-511', building: '2号楼', floor: 5, capacity: 1, status: 'full', roomType: '单人间', gender: '男', rentalCategory: 'long', monthlyRate: 800, departmentId: this.deptId },
{ roomNumber: '2-512', building: '2号楼', floor: 5, capacity: 1, status: 'full', roomType: '单人间', gender: '女', rentalCategory: 'long', monthlyRate: 800, departmentId: this.deptId },
{ roomNumber: '2-513', building: '2号楼', floor: 5, capacity: 1, status: 'full', roomType: '单人间', gender: '女', rentalCategory: 'long', monthlyRate: 800, departmentId: this.deptId },
{ roomNumber: '2-515', building: '2号楼', floor: 5, capacity: 1, status: 'full', roomType: '单人间', gender: '女', rentalCategory: 'long', monthlyRate: 800, departmentId: this.deptId },
{ roomNumber: '2-516', building: '2号楼', floor: 5, capacity: 1, status: 'full', roomType: '单人间', gender: '女', rentalCategory: 'long', monthlyRate: 800, departmentId: this.deptId },
{ roomNumber: '2-517', building: '2号楼', floor: 5, capacity: 1, status: 'full', roomType: '单人间', gender: '女', rentalCategory: 'long', monthlyRate: 800, departmentId: this.deptId },
{ roomNumber: '2-518', building: '2号楼', floor: 5, capacity: 1, status: 'full', roomType: '单人间', gender: '女', rentalCategory: 'long', monthlyRate: 800, departmentId: this.deptId },
{ roomNumber: '2-519', building: '2号楼', floor: 5, capacity: 1, status: 'full', roomType: '单人间', gender: '女', rentalCategory: 'long', monthlyRate: 800, departmentId: this.deptId },
// 1号楼 家庭房
{ roomNumber: '1-2-301', building: '1号楼', floor: 3, capacity: 2, status: 'full', roomType: '家庭房', gender: '男', rentalCategory: 'long', monthlyRate: 1200, departmentId: this.deptId },
// 四人间 pattern
{ roomNumber: '3-106', building: '3号楼', floor: 1, capacity: 4, status: 'available', roomType: '四人间', gender: '女', rentalCategory: 'long', monthlyRate: 1200, departmentId: this.deptId },
{ roomNumber: '3-107', building: '3号楼', floor: 1, capacity: 4, status: 'full', roomType: '四人间', gender: '女', rentalCategory: 'long', monthlyRate: 1200, departmentId: this.deptId },
{ roomNumber: '4-107', building: '4号楼', floor: 1, capacity: 4, status: 'available', roomType: '四人间', gender: '男', rentalCategory: 'long', monthlyRate: 1200, departmentId: this.deptId },
{ roomNumber: '4-111', building: '4号楼', floor: 1, capacity: 4, status: 'available', roomType: '四人间', gender: '男', rentalCategory: 'long', monthlyRate: 1200, departmentId: this.deptId },
{ roomNumber: '4-201', building: '4号楼', floor: 2, capacity: 4, status: 'available', roomType: '四人间', gender: '男', rentalCategory: 'long', monthlyRate: 1200, departmentId: this.deptId },
{ roomNumber: '4-204', building: '4号楼', floor: 2, capacity: 4, status: 'available', roomType: '四人间', gender: '男', rentalCategory: 'long', monthlyRate: 1200, departmentId: this.deptId },
{ roomNumber: '5-109', building: '5号楼', floor: 1, capacity: 4, status: 'available', roomType: '四人间', gender: '女', rentalCategory: 'long', monthlyRate: 1200, departmentId: this.deptId },
{ roomNumber: '6-116', building: '6号楼', floor: 1, capacity: 4, status: 'available', roomType: '四人间', gender: '男', rentalCategory: 'long', monthlyRate: 1200, departmentId: this.deptId },
];
const saved = await this.roomRepo.save(rooms);
this.cachedRooms = saved;
this.logger.log(` ✓ ${saved.length} rooms`);
}
// ── 2c: classrooms ───────────────────────────────────
private async seedClassrooms(): Promise<void> {
const classrooms = [
{ name: '102', building: 'a座', floor: 1, capacity: 30, roomType: '大', supervisor: '陈浩', departmentId: this.deptId },
{ name: '201', building: 'a座', floor: 2, capacity: 30, roomType: '大', supervisor: '刘老师', departmentId: this.deptId },
{ name: '202', building: 'a座', floor: 2, capacity: 25, roomType: '次大', supervisor: '刘老师', departmentId: this.deptId },
{ name: '301', building: 'b座', floor: 3, capacity: 20, roomType: '小', supervisor: '黄老师', departmentId: this.deptId },
];
const saved = await this.classroomRepo.save(classrooms);
this.cachedClassrooms = saved;
this.logger.log(` ✓ ${saved.length} classrooms`);
}
// ── 2d: students ─────────────────────────────────────
private async seedStudents(): Promise<void> {
// Real data pattern: organization fields like 恭学专升本, 26定向, 续住, etc.
const students: Array<{ name: string; phone: string; studentNo: string; gender: string; ethnicity: string; organization: string; supervisor: string; departmentId: number; status: string }> = [
// 26定向 students
{ name: '聂天羽', phone: '12345678912', studentNo: '123456', gender: '女', ethnicity: '汉', organization: '恭学专升本', supervisor: '', departmentId: this.deptId, status: 'active' },
{ name: '艾柯丽努尔·艾买尔江', phone: '', studentNo: '', gender: '女', ethnicity: '汉', organization: '26定向', supervisor: '', departmentId: this.deptId, status: 'active' },
{ name: '陈昊天', phone: '', studentNo: '', gender: '男', ethnicity: '汉', organization: '续住', supervisor: '糕糕', departmentId: this.deptId, status: 'active' },
{ name: '赵璟涵', phone: '', studentNo: '', gender: '女', ethnicity: '汉', organization: '26定向', supervisor: '', departmentId: this.deptId, status: 'active' },
{ name: '周子涵', phone: '', studentNo: '', gender: '女', ethnicity: '汉', organization: '26定向', supervisor: '', departmentId: this.deptId, status: 'active' },
{ name: '秦婧怡', phone: '', studentNo: '', gender: '女', ethnicity: '汉', organization: '26尊享+暑文', supervisor: '', departmentId: this.deptId, status: 'active' },
{ name: '石欣欣', phone: '', studentNo: '', gender: '女', ethnicity: '汉', organization: '26尊享', supervisor: '', departmentId: this.deptId, status: 'active' },
{ name: '李光铄', phone: '', studentNo: '', gender: '男', ethnicity: '汉', organization: '26定向', supervisor: '', departmentId: this.deptId, status: 'active' },
{ name: '田芸竹', phone: '12345678920', studentNo: '123464', gender: '女', ethnicity: '汉', organization: '恭学专升本', supervisor: '', departmentId: this.deptId, status: 'active' },
{ name: '荚欣语', phone: '12345678921', studentNo: '123465', gender: '女', ethnicity: '汉', organization: '恭学专升本', supervisor: '', departmentId: this.deptId, status: 'active' },
{ name: '刘倬宁', phone: '12345678922', studentNo: '123466', gender: '女', ethnicity: '汉', organization: '恭学专升本', supervisor: '', departmentId: this.deptId, status: 'active' },
{ name: '柴高星', phone: '', studentNo: '', gender: '女', ethnicity: '汉', organization: '26尊享+暑专+专冲', supervisor: '', departmentId: this.deptId, status: 'active' },
{ name: '焦怡菲', phone: '', studentNo: '', gender: '女', ethnicity: '汉', organization: '26尊享+暑期+专冲+年前文化', supervisor: '', departmentId: this.deptId, status: 'active' },
{ name: '王姿璇', phone: '', studentNo: '', gender: '女', ethnicity: '汉', organization: '26定向', supervisor: '', departmentId: this.deptId, status: 'active' },
{ name: '寇星彤', phone: '12345678926', studentNo: '123470', gender: '女', ethnicity: '汉', organization: '恭学专升本', supervisor: '', departmentId: this.deptId, status: 'active' },
// 续住 students
{ name: '於嘉丽', phone: '', studentNo: '', gender: '女', ethnicity: '汉族', organization: '续住', supervisor: '泡泡', departmentId: this.deptId, status: 'active' },
{ name: '郑斌', phone: '', studentNo: '', gender: '男', ethnicity: '汉族', organization: '续住', supervisor: '糕糕', departmentId: this.deptId, status: 'active' },
{ name: '仵梓钰', phone: '', studentNo: '', gender: '女', ethnicity: '汉族', organization: '续住', supervisor: '方方', departmentId: this.deptId, status: 'active' },
{ name: '覃鼎浩', phone: '', studentNo: '', gender: '男', ethnicity: '汉族', organization: '续住', supervisor: '云熙', departmentId: this.deptId, status: 'active' },
{ name: '常智禹', phone: '', studentNo: '', gender: '男', ethnicity: '汉族', organization: '续住', supervisor: '方方', departmentId: this.deptId, status: 'active' },
{ name: '郭庆泉', phone: '', studentNo: '', gender: '男', ethnicity: '汉族', organization: '续住', supervisor: '糕糕', departmentId: this.deptId, status: 'active' },
{ name: '孙立欣', phone: '', studentNo: '', gender: '男', ethnicity: '汉族', organization: '续住', supervisor: '糕糕', departmentId: this.deptId, status: 'active' },
{ name: '韩尧祖', phone: '', studentNo: '', gender: '男', ethnicity: '汉族', organization: '', supervisor: '', departmentId: this.deptId, status: 'active' },
{ name: '陈亚津', phone: '', studentNo: '', gender: '女', ethnicity: '汉族', organization: '', supervisor: '', departmentId: this.deptId, status: 'active' },
{ name: '孟思妍', phone: '', studentNo: '', gender: '女', ethnicity: '汉族', organization: '26定向', supervisor: '', departmentId: this.deptId, status: 'active' },
{ name: '武嘉怡', phone: '', studentNo: '', gender: '女', ethnicity: '汉族', organization: '26定向', supervisor: '', departmentId: this.deptId, status: 'active' },
{ name: '刘禹含', phone: '', studentNo: '', gender: '女', ethnicity: '汉族', organization: '26定向', supervisor: '', departmentId: this.deptId, status: 'active' },
{ name: '杜瑾慧', phone: '', studentNo: '', gender: '女', ethnicity: '汉族', organization: '26定向', supervisor: '', departmentId: this.deptId, status: 'active' },
{ name: '孟凡志', phone: '', studentNo: '', gender: '男', ethnicity: '汉族', organization: '26定向', supervisor: '', departmentId: this.deptId, status: 'active' },
];
const saved = await this.studentRepo.save(students);
this.cachedStudents = saved;
this.logger.log(` ✓ ${saved.length} students`);
}
// ── 3a: classes ──────────────────────────────────────
private async seedClasses(): Promise<void> {
const clsData = [
{ name: '26定向班', code: 'DX2026-01', classType: ClassType.CULTURE, status: ClassStatus.ACTIVE },
{ name: '26尊享班', code: 'ZX2026-01', classType: ClassType.PROFESSIONAL, status: ClassStatus.ACTIVE },
{ name: '续住1班', code: 'XZ2026-01', classType: ClassType.CULTURE, status: ClassStatus.ACTIVE },
{ name: '恭学专升本1班', code: 'ZS2026-01', classType: ClassType.PROFESSIONAL, status: ClassStatus.ACTIVE },
{ name: '暑期文化课', code: 'SQ2026-01', classType: ClassType.SPRINT, status: ClassStatus.ENROLLING },
];
const savedClasses: Class[] = [];
for (const c of clsData) {
const saved = await this.classRepo.save({
...c,
departmentId: this.deptId,
startDate: '2026-04-01',
endDate: '2026-08-31',
maxStudents: 30,
});
savedClasses.push(saved);
}
// Distribute students
const orgMap: Record<string, Student[]> = {};
for (const s of this.cachedStudents) {
const key = s.organization || 'other';
(orgMap[key] ??= []).push(s);
}
const assignments: Record<string, Class> = {
'26定向': savedClasses[0],
'26尊享': savedClasses[1],
'续住': savedClasses[2],
'恭学专升本': savedClasses[3],
};
for (const [org, students] of Object.entries(orgMap)) {
// Match by prefix
const clsKey = Object.keys(assignments).find((k) => org.startsWith(k) || k.startsWith(org));
const cls = clsKey ? assignments[clsKey] : pick(savedClasses);
for (const s of students) {
await this.classStudentRepo.save({
classId: cls!.id,
studentId: s.id,
joinDate: '2026-04-01',
status: 'active',
});
}
}
// Assign teachers
for (const cls of savedClasses) {
const teacher = pick(this.cachedUsers);
await this.classTeacherRepo.save({
classId: cls.id,
userId: teacher.id,
roleType: TeacherRoleType.HEAD_TEACHER,
});
await this.classRepo.update(cls.id, { headTeacherId: teacher.id });
}
this.cachedClasses = savedClasses;
this.logger.log(` ✓ ${savedClasses.length} classes`);
}
// ── 3b: occupancies ──────────────────────────────────
private async seedOccupancies(): Promise<void> {
// Real data pattern: students mapped to specific rooms
const mapping: Array<{ studentIdx: number; roomIdx: number; checkInDate: string; notes: string }> = [
{ studentIdx: 0, roomIdx: 14, checkInDate: '2026-04-01', notes: '' }, // 聂天羽 -> 2-516
{ studentIdx: 1, roomIdx: 3, checkInDate: '2026-07-12', notes: '定向' }, // 艾柯丽努尔 -> 2-505
{ studentIdx: 2, roomIdx: 4, checkInDate: '2026-03-01', notes: '续住' }, // 陈昊天 -> 2-506
{ studentIdx: 3, roomIdx: 5, checkInDate: '2026-07-12', notes: '定向' }, // 赵璟涵 -> 2-507
{ studentIdx: 4, roomIdx: 6, checkInDate: '2026-07-12', notes: '定向' }, // 周子涵 -> 2-508
{ studentIdx: 5, roomIdx: 7, checkInDate: '2026-07-12', notes: '暑期文化+尊享' },// 秦婧怡 -> 2-509
{ studentIdx: 6, roomIdx: 12, checkInDate: '2026-09-15', notes: '' }, // 石欣欣 -> 2-513
{ studentIdx: 7, roomIdx: 10, checkInDate: '2026-07-12', notes: '定向' }, // 李光铄 -> 2-511
{ studentIdx: 8, roomIdx: 13, checkInDate: '2026-09-15', notes: '' }, // 田芸竹 -> 2-515
{ studentIdx: 9, roomIdx: 0, checkInDate: '2026-09-15', notes: '' }, // 荚欣语 -> 2-502
{ studentIdx: 10, roomIdx: 1, checkInDate: '2026-09-15', notes: '' }, // 刘倬宁 -> 2-503
{ studentIdx: 11, roomIdx: 14, checkInDate: '2026-08-12', notes: '' }, // 柴高星 -> 2-516
{ studentIdx: 12, roomIdx: 15, checkInDate: '2026-07-12', notes: '定向' }, // 焦怡菲 -> 2-517
{ studentIdx: 13, roomIdx: 16, checkInDate: '2026-07-12', notes: '定向' }, // 王姿璇 -> 2-518
{ studentIdx: 14, roomIdx: 2, checkInDate: '2026-06-05', notes: '' }, // 寇星彤 -> 2-504
{ studentIdx: 15, roomIdx: 19, checkInDate: '2026-04-01', notes: '' }, // 於嘉丽 -> 3-106
{ studentIdx: 16, roomIdx: 21, checkInDate: '2026-04-01', notes: '' }, // 郑斌 -> 4-107
{ studentIdx: 17, roomIdx: 23, checkInDate: '2026-04-01', notes: '' }, // 仵梓钰 -> 4-201
{ studentIdx: 18, roomIdx: 25, checkInDate: '2026-04-01', notes: '' }, // 覃鼎浩 -> 5-109
{ studentIdx: 19, roomIdx: 17, checkInDate: '2026-04-01', notes: '' }, // 常智禹 -> 1-2-301
{ studentIdx: 20, roomIdx: 8, checkInDate: '2026-05-14', notes: '' }, // 郭庆泉 -> 2-510
{ studentIdx: 21, roomIdx: 8, checkInDate: '2026-05-14', notes: '' }, // 孙立欣 -> 2-510
{ studentIdx: 22, roomIdx: 18, checkInDate: '2026-06-09', notes: '' }, // 韩尧祖 -> 3-107
{ studentIdx: 23, roomIdx: 20, checkInDate: '2026-08-15', notes: '' }, // 陈亚津 -> 4-111
{ studentIdx: 24, roomIdx: 26, checkInDate: '2026-07-12', notes: '' }, // 孟思妍 -> 6-116
{ studentIdx: 25, roomIdx: 26, checkInDate: '2026-07-12', notes: '' }, // 武嘉怡 -> 6-116
{ studentIdx: 26, roomIdx: 26, checkInDate: '2026-07-12', notes: '' }, // 刘禹含 -> 6-116
{ studentIdx: 27, roomIdx: 26, checkInDate: '2026-07-12', notes: '' }, // 杜瑾慧 -> 6-116
{ studentIdx: 28, roomIdx: 18, checkInDate: '2026-06-04', notes: '' }, // 孟凡志 -> 3-107
];
const occupancies: Array<{ studentId: number; roomId: number; checkInDate: string; billingStartDate: string; rentalType: string; notes: string; departmentId: number; checkOutDate?: string; billingEndDate?: string }> = [];
for (const m of mapping) {
const student = this.cachedStudents[m.studentIdx];
const room = this.cachedRooms[m.roomIdx];
if (student && room) {
occupancies.push({
studentId: student.id,
roomId: room.id,
checkInDate: m.checkInDate,
billingStartDate: m.checkInDate,
rentalType: room.rentalCategory,
notes: m.notes,
departmentId: this.deptId,
});
}
}
// One checkout: 陈昊天 checked out
occupancies[2].checkOutDate = '2026-06-09';
occupancies[2].billingEndDate = '2026-06-09';
await this.occupancyRepo.save(occupancies);
this.logger.log(` ✓ ${occupancies.length} occupancies`);
}
// ── 3c: class schedules ──────────────────────────────
private async seedSchedules(): Promise<void> {
const subjects = ['数学', '英语', '语文', '专业课', '政治', '历史'];
const schedules: Array<{ classId: number; classroomId: number; weekDay: number; startTime: string; endTime: string; startDate: string; endDate: string; subject: string; teacherId: number; scheduleType: string; departmentId: number }> = [];
for (const cls of this.cachedClasses.slice(0, 3)) {
for (let day = 1; day <= 5; day++) {
schedules.push(
{
classId: cls.id,
classroomId: pick(this.cachedClassrooms).id,
weekDay: day,
startTime: '08:30',
endTime: '10:00',
startDate: cls.startDate ?? '2026-04-01',
endDate: cls.endDate ?? '2026-08-31',
subject: pick(subjects),
teacherId: pick(this.cachedUsers).id,
scheduleType: ScheduleType.INTERNAL,
departmentId: this.deptId,
},
{
classId: cls.id,
classroomId: pick(this.cachedClassrooms).id,
weekDay: day,
startTime: '10:30',
endTime: '12:00',
startDate: cls.startDate ?? '2026-04-01',
endDate: cls.endDate ?? '2026-08-31',
subject: pick(subjects),
teacherId: pick(this.cachedUsers).id,
scheduleType: ScheduleType.INTERNAL,
departmentId: this.deptId,
},
);
}
}
await this.scheduleRepo.save(schedules);
this.logger.log(` ✓ ${schedules.length} schedules`);
}
// ── 4a: room expenses ────────────────────────────────
private async seedRoomExpenses(): Promise<void> {
// Real data: electricity + water per room, April & May 2026
const expenseRooms = [
{ roomIdx: 24, electric: { apr: 38.55, may: 57.81 }, water: { apr: 9.80, may: 9.80 } }, // 5-109
{ roomIdx: 19, electric: { apr: 44.34, may: 35.16 }, water: { apr: 9.80, may: 4.90 } }, // 3-106
{ roomIdx: 17, electric: { apr: 27.09, may: 23.84 }, water: { apr: 4.90, may: 4.90 } }, // 1-2-301
{ roomIdx: 21, electric: { apr: 42.79, may: 41.21 }, water: { apr: 9.80, may: 9.80 } }, // 4-107
{ roomIdx: 22, electric: { apr: 39.90, may: 31.99 }, water: { apr: 9.80, may: 4.90 } }, // 4-111
{ roomIdx: 23, electric: { apr: 101.00, may: 98.18 }, water: { apr: 19.60, may: 19.60 } }, // 4-201
];
const expenses: Array<{ roomId: number; expenseType: string; amount: number; periodStart: string; periodEnd: string; description: string; departmentId: number }> = [];
for (const er of expenseRooms) {
const room = this.cachedRooms[er.roomIdx];
if (!room) continue;
// April
expenses.push({
roomId: room.id, expenseType: 'electricity', amount: er.electric.apr,
periodStart: '2026-04-01', periodEnd: '2026-04-30',
description: `电费 - ${room.roomNumber} 4月`, departmentId: this.deptId,
});
expenses.push({
roomId: room.id, expenseType: 'water', amount: er.water.apr,
periodStart: '2026-04-01', periodEnd: '2026-04-30',
description: `水费 - ${room.roomNumber} 4月`, departmentId: this.deptId,
});
// May
expenses.push({
roomId: room.id, expenseType: 'electricity', amount: er.electric.may,
periodStart: '2026-05-01', periodEnd: '2026-05-31',
description: `电费 - ${room.roomNumber} 5月`, departmentId: this.deptId,
});
expenses.push({
roomId: room.id, expenseType: 'water', amount: er.water.may,
periodStart: '2026-05-01', periodEnd: '2026-05-31',
description: `水费 - ${room.roomNumber} 5月`, departmentId: this.deptId,
});
}
await this.roomExpenseRepo.save(expenses);
this.logger.log(` ✓ ${expenses.length} room expenses`);
}
// ── 4b: deposits ─────────────────────────────────────
private async seedDeposits(): Promise<void> {
// Real data: deposits tied to specific students
const depositStudents = [24, 25, 26, 27, 28, 19, 2]; // indices into cachedStudents
const deposits: Array<{ studentId: number; amount: number; status: string; paidDate: string; departmentId: number }> = [];
for (const idx of depositStudents) {
const s = this.cachedStudents[idx];
if (!s) continue;
deposits.push({
studentId: s.id,
amount: 500,
status: 'paid',
paidDate: s.id <= this.cachedStudents[25].id ? '2026-07-12' : '2026-06-04',
departmentId: this.deptId,
});
}
// Manual deposits with custom amounts
deposits.push({ studentId: this.cachedStudents[19].id, amount: 200, status: 'paid', paidDate: '2026-03-01', departmentId: this.deptId }); // 常智禹
deposits.push({ studentId: this.cachedStudents[2].id, amount: 121.60, status: 'paid', paidDate: '2026-03-01', departmentId: this.deptId }); // 陈昊天
await this.depositRepo.save(deposits);
this.logger.log(` ✓ ${deposits.length} deposits`);
}
// ── 4c: bills ────────────────────────────────────────
private async seedBills(): Promise<void> {
// Real data: bills for students with occupancies, April & May
const billData = [
{ studentIdx: 15, roomIdx: 19, sharedApr: 54.14, sharedMay: 40.06 }, // 於嘉丽
{ studentIdx: 16, roomIdx: 21, sharedApr: 52.59, sharedMay: 51.01 }, // 郑斌
{ studentIdx: 17, roomIdx: 22, sharedApr: 49.70, sharedMay: 36.89 }, // 仵梓钰
{ studentIdx: 18, roomIdx: 24, sharedApr: 120.60, sharedMay: 117.78 }, // 覃鼎浩
{ studentIdx: 19, roomIdx: 17, sharedApr: 31.99, sharedMay: 28.74 }, // 常智禹
{ studentIdx: 2, roomIdx: 4, sharedApr: 48.35, sharedMay: 67.61 }, // 陈昊天
];
for (const bd of billData) {
const student = this.cachedStudents[bd.studentIdx];
const room = this.cachedRooms[bd.roomIdx];
if (!student || !room) continue;
// April bill
const billApr = await this.billRepo.save({
studentId: student.id,
periodStart: '2026-04-01',
periodEnd: '2026-04-30',
sharedAmount: bd.sharedApr,
personalAmount: 0,
totalAmount: bd.sharedApr,
status: 'paid',
departmentId: this.deptId,
});
await this.billItemRepo.save([
{ billId: billApr.id, roomId: room.id, expenseType: 'electricity', description: '电费分摊', days: 30, studentAmount: Math.round(bd.sharedApr * 0.82 * 100) / 100 },
{ billId: billApr.id, roomId: room.id, expenseType: 'water', description: '水费分摊', days: 30, studentAmount: Math.round(bd.sharedApr * 0.18 * 100) / 100 },
]);
// May bill
const billMay = await this.billRepo.save({
studentId: student.id,
periodStart: '2026-05-01',
periodEnd: '2026-05-31',
sharedAmount: bd.sharedMay,
personalAmount: 0,
totalAmount: bd.sharedMay,
status: 'paid',
departmentId: this.deptId,
});
await this.billItemRepo.save([
{ billId: billMay.id, roomId: room.id, expenseType: 'electricity', description: '电费分摊', days: 31, studentAmount: Math.round(bd.sharedMay * 0.82 * 100) / 100 },
{ billId: billMay.id, roomId: room.id, expenseType: 'water', description: '水费分摊', days: 31, studentAmount: Math.round(bd.sharedMay * 0.18 * 100) / 100 },
]);
}
this.logger.log(' ✓ bills + items (April & May 2026)');
}
// ── 5a: attendance ───────────────────────────────────
private async seedAttendance(): Promise<void> {
const statuses = ['present', 'absent', 'late', 'leave'];
const records: Array<{ studentId: number; classId: number; attendanceDate: string; session: string; status: string; source: string; departmentId: number }> = [];
for (const cls of this.cachedClasses) {
const classStudents = await this.classStudentRepo.find({ where: { classId: cls.id } });
for (const cs of classStudents) {
// Last 10 weekdays
let d = 0;
let count = 0;
while (count < 10) {
const date = new Date();
date.setDate(date.getDate() - d);
const dow = date.getDay();
if (dow !== 0 && dow !== 6) {
records.push({
studentId: cs.studentId,
classId: cls.id,
attendanceDate: date.toISOString().slice(0, 10),
session: 'am',
status: pick(statuses),
source: 'manual',
departmentId: this.deptId,
});
count++;
}
d++;
}
}
}
await this.attendanceRepo.save(records);
this.logger.log(` ✓ ${records.length} attendance records`);
}
// ── 5b: classroom rentals ────────────────────────────
private async seedClassroomRentals(): Promise<void> {
if (this.cachedClassrooms.length > 0 && this.cachedTenants.length > 0) {
await this.rentalRepo.save({
classroomId: this.cachedClassrooms[0].id,
tenantId: this.cachedTenants[0].id,
startDate: '2026-05-14',
endDate: '2026-06-30',
totalAmount: 30000,
status: 'active',
departmentId: this.deptId,
});
this.logger.log(' ✓ 1 classroom rental');
}
}
// ── 6a: student profiles ─────────────────────────────
private async seedProfiles(): Promise<void> {
const colleges = ['北京大学', '清华大学', '复旦大学', '浙江大学', '南京大学'];
const profiles = this.cachedStudents.slice(0, 10).map((s) => ({
studentId: s.id,
targetCollege: pick(colleges),
targetMajor: pick(['计算机科学', '数学', '物理学', '经济学']),
subjectDirection: pick(['理科', '文科']),
grade: '高三',
campusLocation: '主校区',
departmentId: this.deptId,
}));
await this.profileRepo.save(profiles);
this.logger.log(` ✓ ${profiles.length} student profiles`);
}
// ── 6b: student enrollments ──────────────────────────
private async seedEnrollments(): Promise<void> {
const enrollments = this.cachedStudents.slice(0, 15).map((s) => ({
studentId: s.id,
courseCategory: pick(['文化课', '专业课', '集训']),
classType: pick(['全日制', '周末班']),
className: pick(['26定向班', '26尊享班', '续住1班']),
headTeacher: '张班主任',
startDate: '2026-04-01',
endDate: '2026-08-31',
status: 'active',
departmentId: this.deptId,
}));
await this.enrollmentRepo.save(enrollments);
this.logger.log(` ✓ ${enrollments.length} enrollments`);
}
// ── 6c: exam scores ──────────────────────────────────
private async seedExamScores(): Promise<void> {
const subjects = ['数学', '英语', '语文', '专业课'];
const exams = ['月考', '期中考试', '模拟考试'];
const scores: Array<{ studentId: number; examType: string; examName: string; subject: string; score: number; examDate: string; departmentId: number }> = [];
for (const s of this.cachedStudents.slice(0, 10)) {
for (const exam of exams) {
for (const subj of subjects) {
scores.push({
studentId: s.id,
examType: 'exam',
examName: exam,
subject: subj,
score: randInt(50, 100),
examDate: `2026-0${randInt(4, 6)}-${String(randInt(1, 28)).padStart(2, '0')}`,
departmentId: this.deptId,
});
}
}
}
await this.examScoreRepo.save(scores);
this.logger.log(` ✓ ${scores.length} exam scores`);
}
// ── 6d: learning records ────────────────────────────
private async seedLearningRecords(): Promise<void> {
const types = ['跟进记录', '家长沟通', '学习反馈', '教学建议'];
const records = this.cachedStudents.slice(0, 12).map((s) => ({
studentId: s.id,
recordDate: `2026-0${randInt(5, 6)}-${String(randInt(1, 28)).padStart(2, '0')}`,
recordType: pick(types),
content: `学习状态：${pick(['良好', '一般', '需加强'])}`,
followUpMethod: pick(['电话', '微信', '面谈']),
nextStep: '继续跟进',
departmentId: this.deptId,
}));
await this.learningRecordRepo.save(records);
this.logger.log(` ✓ ${records.length} learning records`);
}
}

58
apps/server/src/seed/seed.module.ts Normal file
View File

@@ -0,0 +1,58 @@
import { Module, OnModuleInit, Logger } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { SeedDevService } from './seed-dev.service';
import {
Student, Room, Occupancy, RoomExpense,
Bill, BillItem, User, Deposit,
Classroom, Tenant, ClassroomRental, Permission, Role,
Class, ClassStudent, ClassTeacher, ClassSchedule,
AttendanceRecord, Department, UserDepartment,
StudentProfile, StudentEnrollment, ExamScore, LearningRecord,
ExpenseType,
} from '../entities';
const SEED_ENTITIES = [
Department, User, Role, Permission, UserDepartment,
Tenant, Student, Room, Classroom, Occupancy,
RoomExpense, ExpenseType, Class,
ClassStudent, ClassTeacher, ClassSchedule, Bill, BillItem,
Deposit, AttendanceRecord,
ClassroomRental, StudentProfile, StudentEnrollment,
ExamScore, LearningRecord,
];
@Module({
imports: [TypeOrmModule.forFeature(SEED_ENTITIES)],
providers: [SeedDevService],
})
export class SeedModule implements OnModuleInit {
private readonly logger = new Logger(SeedModule.name);
constructor(private readonly seedService: SeedDevService) {}
async onModuleInit() {
const enabled = process.env['SEED_DEV'] === 'true' || process.env['NODE_ENV'] === 'development';
const skip = process.env['SEED_DEV_SKIP'] === 'true';
if (!enabled || skip) {
this.logger.log(
`Seed skipped: SEED_DEV=${process.env['SEED_DEV']}, NODE_ENV=${process.env['NODE_ENV']}, SKIP=${skip}`,
);
return;
}
const studentCount = await this.seedService.getStudentCount();
if (studentCount > 0) {
this.logger.log(`Seed skipped: ${studentCount} students already exist`);
return;
}
this.logger.log('Starting mock data seeding...');
try {
await this.seedService.seed();
this.logger.log('Mock data seeding completed successfully');
} catch (err) {
this.logger.error('Mock data seeding failed', err instanceof Error ? err.stack : String(err));
}
}
}

8
apps/server/src/students/dto/student.dto.ts
View File

@@ -4,6 +4,10 @@ export class CreateStudentDto {
@IsString()
name: string;
@IsOptional()
@IsString()
studentNo?: string;
@IsOptional()
@IsString()
phone?: string;
@@ -53,6 +57,10 @@ export class UpdateStudentDto {
@IsString()
name?: string;
@IsOptional()
@IsString()
studentNo?: string;
@IsOptional()
@IsString()
phone?: string;

27
apps/server/src/sync/sync.controller.ts
View File

@@ -1,4 +1,4 @@
import { Controller, Get, Post, Query, UseGuards } from '@nestjs/common';
import { BadRequestException, Controller, Get, Post, Query, UseGuards } from '@nestjs/common';
import { JwtAuthGuard } from '../auth/guards/jwt-auth.guard';
import { RequirePermission } from '../auth/decorators/permission.decorator';
import { SyncService } from './sync.service';
@@ -11,8 +11,12 @@ export class SyncController {
@Post('trigger')
@RequirePermission('sync:trigger')
async triggerSync(@Query('platform') platform?: SyncPlatform) {
const logs = await this.syncService.triggerSync(platform);
async triggerSync(
@Query('platform') platform?: SyncPlatform,
@Query('rootDeptId') rootDeptId?: string,
) {
const rootId = rootDeptId ? this.parseRootDeptId(rootDeptId) : 1;
const logs = await this.syncService.triggerSync(platform, rootId);
return { synced: logs.length, logs };
}
@@ -27,6 +31,15 @@ export class SyncController {
};
}
/** 获取钉钉组织部门树，供前端选择同步起点 */
@Get('dingtalk/org-tree')
@RequirePermission('sync:read')
async getDingTalkOrgTree(@Query('rootDeptId') rootDeptId?: string) {
const rootId = rootDeptId ? this.parseRootDeptId(rootDeptId) : 1;
const tree = await this.syncService.getDingTalkOrgTree(rootId);
return { success: true, data: tree };
}
@Get('logs')
@RequirePermission('sync:read')
async getLogs(
@@ -35,4 +48,12 @@ export class SyncController {
) {
return this.syncService.getLogs(platform, limit ? Number(limit) : 50);
}
private parseRootDeptId(rootDeptId: string): number {
const parsed = parseInt(rootDeptId, 10);
if (isNaN(parsed)) {
throw new BadRequestException('rootDeptId must be a valid integer');
}
return parsed;
}
}

21
apps/server/src/sync/sync.service.ts
View File

@@ -33,7 +33,7 @@ export class SyncService {
}
// ── Sync DingTalk ──
async syncDingTalk(): Promise<SyncLog> {
async syncDingTalk(rootDeptId = 1): Promise<SyncLog> {
const platform: SyncPlatform = 'dingtalk';
const syncType = await this.determineSyncType(platform);
@@ -45,7 +45,7 @@ export class SyncService {
// ── Call existing integration APIs ──
// Integration hooks — extend here to call DingTalk APIs with lastSyncAt
const recordsCount = await this.performDingTalkSync(lastSyncAt);
const recordsCount = await this.performDingTalkSync(lastSyncAt, rootDeptId);
await this.updateLastSyncAt(platform);
await this.finishSyncLog(log, 'success', recordsCount);
@@ -87,10 +87,15 @@ export class SyncService {
}
// ── Manual trigger ──
async triggerSync(platform?: SyncPlatform): Promise<SyncLog[]> {
if (platform === 'dingtalk') return [await this.syncDingTalk()];
async triggerSync(platform?: SyncPlatform, rootDeptId = 1): Promise<SyncLog[]> {
if (platform === 'dingtalk') return [await this.syncDingTalk(rootDeptId)];
if (platform === 'wecom') return [await this.syncWeCom()];
return [await this.syncDingTalk(), await this.syncWeCom()];
return [await this.syncDingTalk(rootDeptId), await this.syncWeCom()];
}
/** 获取钉钉组织部门树，供前端选择同步起点 */
async getDingTalkOrgTree(rootDeptId = 1) {
return this.dingTalkService.fetchOrgTree(rootDeptId);
}
// ── Sync log queries ──
@@ -154,9 +159,9 @@ export class SyncService {
await this.syncLogRepo.save(log);
}
private async performDingTalkSync(lastSyncAt: Date | null): Promise<number> {
private async performDingTalkSync(lastSyncAt: Date | null, rootDeptId = 1): Promise<number> {
// Stage 1: Sync departments and users
const result = await this.dingTalkService.syncAll();
const result = await this.dingTalkService.syncAll(rootDeptId);
let total = result.deptCount + result.userCount;
// Stage 2: Import attendance data (last 7 days or since last sync)
@@ -175,7 +180,7 @@ export class SyncService {
this.logger.log(`Importing DingTalk attendance: ${start} ~ ${end}`);
const mappings = await this.mappingRepo.find();
const userIds = mappings.map((m) => m.dingUserId).filter(Boolean);
const userIds = mappings.map((m) => m.dingUserId);
const importResult = await this.attendanceImportService.importFromDingTalk({
startDate: start,
endDate: end,