feat: 全系统优化 — 并发控制 + 冗余清理 + 数据流修复 + 全面测试
核心修复: - 状态机加 SELECT FOR UPDATE 行锁,消除并发竞态 - hss_md_staff 加 role 列,登录从数据库读取真实角色 - 申请重复校验排除自身,全流程 20 步闭环通过 - 派单 SQL 修复 + 支付状态机过渡 + 完成服务 plan_item_id 修复 并发控制新增: - RedisLockService (SET NX PX + Lua 安全解锁) - RateLimiterService (Redis 滑动窗口 + API 拦截器) - TransactionIsolationConfig (SERIALIZABLE for 支付回调) - MqttPublisher (异步队列 + JDK TCP 探测) - ObjectStorageService (AWS SigV4 预签名, 纯 JDK) 冗余清理: - 删除 6 个死代码文件 (~620 行) - hutool-all → JDK MessageDigest, 去 MapStruct, 去 jsr310 - haversine 提取到 GeoUtil, count/round 提取到 JdbcUtil - 创建 platform layout 组件 前端修复: - 登录页移除角色选择器, 由后端 JWT 返回 - 移除 ClientOnly 包裹, 页面正常渲染 - SPA fallback Nginx 配置修复 Docker: 运行时镜像 eclipse-temurin:17-jre-jammy (缩小 ~300MB) 文档: 新增系统实现与修复报告.md Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -6,32 +6,17 @@ export interface PlatformUser {
|
||||
userRole: string
|
||||
tenantId: string
|
||||
orgId: string
|
||||
token?: string
|
||||
}
|
||||
|
||||
const ROLES = [
|
||||
{ key: 'ADMIN', label: '系统管理员' },
|
||||
{ key: 'RECEPTIONIST', label: '受理员' },
|
||||
{ key: 'ASSESSOR', label: '评估员' },
|
||||
{ key: 'PLANNER', label: '方案制定员' },
|
||||
{ key: 'DISPATCHER', label: '调度员' },
|
||||
{ key: 'STAFF', label: '服务人员' },
|
||||
{ key: 'SETTLER', label: '结算员' },
|
||||
{ key: 'SUPERVISOR', label: '监管员' },
|
||||
{ key: 'REVIEWER', label: '复核员' },
|
||||
]
|
||||
|
||||
const PRESET_USERS: Record<string, PlatformUser> = {
|
||||
admin: { userId: '1', userName: '系统管理员', userRole: 'ADMIN', tenantId: '1', orgId: '1' },
|
||||
receptionist: { userId: '2', userName: '受理员小王', userRole: 'RECEPTIONIST', tenantId: '1', orgId: '1' },
|
||||
assessor: { userId: '3', userName: '评估员老张', userRole: 'ASSESSOR', tenantId: '1', orgId: '1' },
|
||||
planner: { userId: '4', userName: '方案员小李', userRole: 'PLANNER', tenantId: '1', orgId: '1' },
|
||||
dispatcher: { userId: '5', userName: '调度员老赵', userRole: 'DISPATCHER', tenantId: '1', orgId: '1' },
|
||||
staff: { userId: '6', userName: '护理员老陈', userRole: 'STAFF', tenantId: '1', orgId: '1' },
|
||||
settler: { userId: '7', userName: '结算员小周', userRole: 'SETTLER', tenantId: '1', orgId: '1' },
|
||||
supervisor: { userId: '8', userName: '监管员老刘', userRole: 'SUPERVISOR', tenantId: '1', orgId: '1' },
|
||||
export const ROLE_LABELS: Record<string, string> = {
|
||||
ADMIN: '系统管理员', RECEPTIONIST: '受理员', ASSESSOR: '评估员',
|
||||
PLANNER: '方案制定员', DISPATCHER: '调度员', STAFF: '服务人员',
|
||||
SETTLER: '结算员', SUPERVISOR: '监管员', REVIEWER: '复核员',
|
||||
}
|
||||
|
||||
const STORAGE_KEY = 'hss_platform_user'
|
||||
const TOKEN_KEY = 'hss_token'
|
||||
|
||||
const currentUser = ref<PlatformUser | null>(null)
|
||||
|
||||
@@ -44,11 +29,13 @@ function loadUser(): PlatformUser | null {
|
||||
|
||||
function saveUser(user: PlatformUser) {
|
||||
localStorage.setItem(STORAGE_KEY, JSON.stringify(user))
|
||||
if (user.token) localStorage.setItem(TOKEN_KEY, user.token)
|
||||
currentUser.value = user
|
||||
}
|
||||
|
||||
function clearUser() {
|
||||
localStorage.removeItem(STORAGE_KEY)
|
||||
localStorage.removeItem(TOKEN_KEY)
|
||||
currentUser.value = null
|
||||
}
|
||||
|
||||
@@ -60,31 +47,34 @@ export function usePlatformAuth() {
|
||||
const isLoggedIn = computed(() => !!currentUser.value)
|
||||
const user = computed(() => currentUser.value)
|
||||
|
||||
function login(username: string): PlatformUser | null {
|
||||
const u = PRESET_USERS[username.toLowerCase()]
|
||||
if (u) { saveUser(u); return u }
|
||||
return null
|
||||
/** 保存登录/注册返回的用户信息 */
|
||||
function setAuth(data: { token: string; userId: number | string; name: string; role: string }) {
|
||||
saveUser({
|
||||
userId: String(data.userId),
|
||||
userName: data.name,
|
||||
userRole: data.role,
|
||||
tenantId: '1',
|
||||
orgId: '1',
|
||||
token: data.token,
|
||||
})
|
||||
}
|
||||
|
||||
function logout() { clearUser() }
|
||||
|
||||
function switchRole(roleKey: string) {
|
||||
if (!currentUser.value) return
|
||||
const updated = { ...currentUser.value, userRole: roleKey }
|
||||
saveUser(updated)
|
||||
function getToken(): string {
|
||||
return localStorage.getItem(TOKEN_KEY) || currentUser.value?.token || ''
|
||||
}
|
||||
|
||||
function getAuthHeaders(): Record<string, string> {
|
||||
const token = getToken()
|
||||
const u = currentUser.value
|
||||
if (!u) return {}
|
||||
return {
|
||||
'X-User-Id': u.userId,
|
||||
'X-User-Role': u.userRole,
|
||||
'X-Tenant-Id': u.tenantId,
|
||||
'X-Org-Id': u.orgId,
|
||||
'Authorization': token ? 'Bearer ' + token : '',
|
||||
'X-Tenant-Id': u?.tenantId || '1',
|
||||
'X-Org-Id': u?.orgId || '1',
|
||||
'Content-Type': 'application/json',
|
||||
}
|
||||
}
|
||||
|
||||
return { isLoggedIn, user, login, logout, switchRole, getAuthHeaders, ROLES, PRESET_USERS }
|
||||
return { isLoggedIn, user, setAuth, logout, getAuthHeaders, getToken }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user