优化+摄像头+扫码绑定

This commit is contained in:
2026-08-10 10:00:52 +08:00
parent db70665ced
commit 9dc445eeb5
41 changed files with 2618 additions and 438 deletions

View File

@@ -1,3 +1,4 @@
import 'package:flutter/foundation.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:maibu_satabot_v2/core/app/app_user_cubit.dart';
import 'package:maibu_satabot_v2/core/domain/entities/user_entity.dart';
@@ -24,15 +25,51 @@ class BindDeviceCubit extends Cubit<BindDeviceState> {
) : super(const BindDeviceState());
UserEntity? get _currentUser => _appUserCubit.state.user;
String get _roleKey => _currentUser?.roleKey ?? 'user';
String get roleKey => state.roleKey;
bool get isOrgEnabled => roleKey == 'admin';
bool get isSiteEnabled => roleKey == 'admin' || roleKey == 'manager';
bool get isUserEnabled =>
roleKey == 'admin' || roleKey == 'manager' || roleKey == 'siteManager';
// ── 去重辅助 ──
List<OrgEntity> _uniqueOrgs(List<OrgEntity> list) {
final seen = <int>{};
return list.where((e) => seen.add(e.id)).toList();
}
List<SiteEntity> _uniqueSites(List<SiteEntity> list) {
final seen = <int>{};
return list.where((e) => seen.add(e.id)).toList();
}
List<UserSimpleEntity> _uniqueUsers(List<UserSimpleEntity> list) {
final seen = <int>{};
return list.where((e) => seen.add(e.id)).toList();
}
/// 确保 selectedId 存在于列表中,否则置 null
int? _validSelected(int? id, List<dynamic> list) {
if (id == null) return null;
final ids = list.map((e) => e.id as int).toSet();
return ids.contains(id) ? id : null;
}
Future<void> init() async {
final user = _currentUser;
if (user == null) return;
if (user == null) {
debugPrint(
'>>> [BindDevice] ERROR: _currentUser is null! AppUserCubit.state.user is null. Cannot proceed.',
);
return;
}
emit(state.copyWith(isLoading: true));
debugPrint(
'>>> [BindDevice] roleKey=${user.roleKey}, orgId=${user.orgId}, siteId=${user.siteId}, userId=${user.userId}, username=${user.username}',
);
switch (_roleKey) {
emit(state.copyWith(isLoading: true, roleKey: user.roleKey ?? 'user'));
switch (roleKey) {
case 'admin':
await _loadAllOrgs();
break;
@@ -57,7 +94,15 @@ class BindDeviceCubit extends Cubit<BindDeviceState> {
result.fold(
(failure) =>
emit(state.copyWith(errorMessage: failure.message, isLoading: false)),
(orgs) => emit(state.copyWith(orgList: orgs)),
(orgs) {
final unique = _uniqueOrgs(orgs);
emit(
state.copyWith(
orgList: unique,
selectedOrgId: _validSelected(state.selectedOrgId, unique),
),
);
},
);
}
@@ -67,8 +112,9 @@ class BindDeviceCubit extends Cubit<BindDeviceState> {
(failure) =>
emit(state.copyWith(errorMessage: failure.message, isLoading: false)),
(orgs) async {
emit(state.copyWith(orgList: orgs, selectedOrgId: user.orgId));
await _loadSitesByOrg(user.orgId);
final unique = _ensureOrgInList(_uniqueOrgs(orgs), user.orgId);
emit(state.copyWith(orgList: unique, selectedOrgId: user.orgId));
await _loadSitesByOrgForManager(user.orgId, user.siteId);
},
);
}
@@ -79,7 +125,8 @@ class BindDeviceCubit extends Cubit<BindDeviceState> {
(failure) =>
emit(state.copyWith(errorMessage: failure.message, isLoading: false)),
(orgs) async {
emit(state.copyWith(orgList: orgs, selectedOrgId: user.orgId));
final unique = _ensureOrgInList(_uniqueOrgs(orgs), user.orgId);
emit(state.copyWith(orgList: unique, selectedOrgId: user.orgId));
await _loadSitesAndUsers(user);
},
);
@@ -91,18 +138,65 @@ class BindDeviceCubit extends Cubit<BindDeviceState> {
(failure) =>
emit(state.copyWith(errorMessage: failure.message, isLoading: false)),
(orgs) async {
emit(state.copyWith(orgList: orgs, selectedOrgId: user.orgId));
final unique = _ensureOrgInList(_uniqueOrgs(orgs), user.orgId);
emit(state.copyWith(orgList: unique, selectedOrgId: user.orgId));
await _loadSitesAndUsers(user);
},
);
}
List<OrgEntity> _ensureOrgInList(List<OrgEntity> orgs, int orgId) {
if (orgs.any((e) => e.id == orgId)) return orgs;
return [...orgs, OrgEntity(id: orgId, name: '组织 #$orgId')];
}
List<SiteEntity> _ensureSiteInList(List<SiteEntity> sites, int? siteId) {
if (siteId == null) return sites;
if (sites.any((e) => e.id == siteId)) return sites;
return [...sites, SiteEntity(id: siteId, name: '场站 #$siteId')];
}
List<UserSimpleEntity> _ensureUserInList(
List<UserSimpleEntity> users,
UserEntity user,
) {
final uid = int.tryParse(user.userId) ?? 0;
if (users.any((e) => e.id == uid)) return users;
return [...users, UserSimpleEntity(id: uid, name: user.nickname)];
}
Future<void> _loadSitesByOrg(int orgId) async {
final result = await _getSitesByOrgUseCase(orgId);
result.fold(
(failure) =>
emit(state.copyWith(errorMessage: failure.message, isLoading: false)),
(sites) => emit(state.copyWith(siteList: sites)),
(sites) {
final unique = _uniqueSites(sites);
emit(
state.copyWith(
siteList: unique,
selectedSiteId: _validSelected(state.selectedSiteId, unique),
),
);
},
);
}
Future<void> _loadSitesByOrgForManager(int orgId, int? siteId) async {
final result = await _getSitesByOrgUseCase(orgId);
result.fold(
(failure) =>
emit(state.copyWith(errorMessage: failure.message, isLoading: false)),
(sites) {
final unique = _ensureSiteInList(_uniqueSites(sites), siteId);
emit(
state.copyWith(
siteList: unique,
selectedSiteId:
siteId ?? _validSelected(state.selectedSiteId, unique),
),
);
},
);
}
@@ -112,7 +206,8 @@ class BindDeviceCubit extends Cubit<BindDeviceState> {
(failure) =>
emit(state.copyWith(errorMessage: failure.message, isLoading: false)),
(sites) async {
emit(state.copyWith(siteList: sites, selectedSiteId: user.siteId));
final unique = _ensureSiteInList(_uniqueSites(sites), user.siteId);
emit(state.copyWith(siteList: unique, selectedSiteId: user.siteId));
if (user.siteId != null) {
await _loadUsers(user);
} else {
@@ -139,23 +234,21 @@ class BindDeviceCubit extends Cubit<BindDeviceState> {
name: user.nickname,
);
result.fold(
(failure) =>
emit(state.copyWith(errorMessage: failure.message, isLoading: false)),
(users) {
final allUsers = <UserSimpleEntity>[];
final seenIds = <int>{};
for (final u in users) {
if (u.id != currentUser.id && !seenIds.contains(u.id)) {
allUsers.add(u);
seenIds.add(u.id);
}
}
if (!seenIds.contains(currentUser.id)) {
allUsers.add(currentUser);
}
(failure) {
final list = _ensureUserInList([], user);
emit(
state.copyWith(
userList: allUsers,
userList: list,
selectedUserId: currentUser.id,
isLoading: false,
),
);
},
(users) {
final unique = _ensureUserInList(_uniqueUsers(users), user);
emit(
state.copyWith(
userList: unique,
selectedUserId: currentUser.id,
isLoading: false,
),
@@ -179,7 +272,10 @@ class BindDeviceCubit extends Cubit<BindDeviceState> {
final result = await _getSitesByOrgUseCase(orgId);
result.fold(
(failure) => emit(state.copyWith(errorMessage: failure.message)),
(sites) => emit(state.copyWith(siteList: sites)),
(sites) {
final unique = _uniqueSites(sites);
emit(state.copyWith(siteList: unique));
},
);
}
@@ -196,7 +292,10 @@ class BindDeviceCubit extends Cubit<BindDeviceState> {
final result = await _getUsersBySiteUseCase(siteId);
result.fold(
(failure) => emit(state.copyWith(errorMessage: failure.message)),
(users) => emit(state.copyWith(userList: users)),
(users) {
final unique = _uniqueUsers(users);
emit(state.copyWith(userList: unique));
},
);
}
@@ -205,32 +304,39 @@ class BindDeviceCubit extends Cubit<BindDeviceState> {
}
Future<bool> submitBind(String deviceId) async {
if (state.selectedOrgId == null ||
state.selectedSiteId == null ||
state.selectedUserId == null) {
emit(state.copyWith(errorMessage: '请选择完整的绑定信息'));
if (state.selectedOrgId == null) {
emit(state.copyWith(errorMessage: '请选择所属组织'));
return false;
}
if (roleKey == 'user' && state.selectedUserId == null) {
emit(state.copyWith(errorMessage: '请选择负责人'));
return false;
}
emit(state.copyWith(isSubmitting: true, errorMessage: null));
final existResult = await _isDeviceAtSiteUseCase(
deviceId: deviceId,
siteId: state.selectedSiteId!,
);
if (state.selectedSiteId != null) {
final existResult = await _isDeviceAtSiteUseCase(
deviceId: deviceId,
siteId: state.selectedSiteId!,
);
final isAtSite = existResult.fold((failure) => false, (exists) => exists);
final isAtSite = existResult.fold((failure) => false, (exists) => exists);
if (isAtSite) {
emit(state.copyWith(isSubmitting: false, errorMessage: '该设备已在当前场站,无需绑定'));
return false;
if (isAtSite) {
emit(
state.copyWith(isSubmitting: false, errorMessage: '该设备已在当前场站,无需绑定'),
);
return false;
}
}
final result = await _bindDeviceUseCase(
deviceIds: [deviceId],
orgId: state.selectedOrgId!,
siteId: state.selectedSiteId!,
userId: state.selectedUserId!,
siteId: state.selectedSiteId,
userId: state.selectedUserId,
);
return result.fold(
@@ -246,11 +352,4 @@ class BindDeviceCubit extends Cubit<BindDeviceState> {
},
);
}
bool get isOrgEnabled => _roleKey == 'admin';
bool get isSiteEnabled => _roleKey == 'admin' || _roleKey == 'manager';
bool get isUserEnabled =>
_roleKey == 'admin' || _roleKey == 'manager' || _roleKey == 'siteManager';
String get roleKey => _roleKey;
}

View File

@@ -8,6 +8,7 @@ class BindDeviceState extends Equatable {
final int? selectedOrgId;
final int? selectedSiteId;
final int? selectedUserId;
final String roleKey;
final bool isLoading;
final bool isSubmitting;
final String? errorMessage;
@@ -20,6 +21,7 @@ class BindDeviceState extends Equatable {
this.selectedOrgId,
this.selectedSiteId,
this.selectedUserId,
this.roleKey = 'user',
this.isLoading = false,
this.isSubmitting = false,
this.errorMessage,
@@ -33,6 +35,7 @@ class BindDeviceState extends Equatable {
int? selectedOrgId,
int? selectedSiteId,
int? selectedUserId,
String? roleKey,
bool? isLoading,
bool? isSubmitting,
String? errorMessage,
@@ -45,6 +48,7 @@ class BindDeviceState extends Equatable {
selectedOrgId: selectedOrgId ?? this.selectedOrgId,
selectedSiteId: selectedSiteId ?? this.selectedSiteId,
selectedUserId: selectedUserId ?? this.selectedUserId,
roleKey: roleKey ?? this.roleKey,
isLoading: isLoading ?? this.isLoading,
isSubmitting: isSubmitting ?? this.isSubmitting,
errorMessage: errorMessage,
@@ -60,9 +64,10 @@ class BindDeviceState extends Equatable {
selectedOrgId,
selectedSiteId,
selectedUserId,
roleKey,
isLoading,
isSubmitting,
errorMessage,
isSuccess,
];
}
}