diff --git a/src/main/java/com/campus/water/controller/WorkOrderController.java b/src/main/java/com/campus/water/controller/WorkOrderController.java index 726e12a..9434b5b 100644 --- a/src/main/java/com/campus/water/controller/WorkOrderController.java +++ b/src/main/java/com/campus/water/controller/WorkOrderController.java @@ -79,7 +79,7 @@ public class WorkOrderController { private String orderId; private boolean approved; } - + // 审核工单 // 2. 修改接口接收方式 @PostMapping("/review") @PreAuthorize("hasAnyRole('SUPER_ADMIN', 'AREA_ADMIN')") diff --git a/src/main/java/com/campus/water/controller/web/AdminController.java b/src/main/java/com/campus/water/controller/web/AdminController.java index 7a81a40..7c9d3f2 100644 --- a/src/main/java/com/campus/water/controller/web/AdminController.java +++ b/src/main/java/com/campus/water/controller/web/AdminController.java @@ -82,6 +82,11 @@ public class AdminController { public ResponseEntity> saveAdmin(@RequestBody Admin admin) { // 实现保持不变 try { + + if (admin.getAdminName() == null || admin.getAdminName().trim().isEmpty()) { + return ResponseEntity.ok(ResultVO.error(400, "管理员姓名不能为空")); + } + Admin savedAdmin = adminService.saveAdmin(admin); return ResponseEntity.ok(ResultVO.success(savedAdmin)); } catch (Exception e) { @@ -121,6 +126,8 @@ public class AdminController { } } + + /** * 管理员个人信息修改 * 允许当前登录用户修改自己的基本信息（不含角色/区域等敏感字段） diff --git a/src/main/java/com/campus/water/service/TerminalServiceImpl.java b/src/main/java/com/campus/water/service/TerminalServiceImpl.java index c3f33c4..655dc2c 100644 --- a/src/main/java/com/campus/water/service/TerminalServiceImpl.java +++ b/src/main/java/com/campus/water/service/TerminalServiceImpl.java @@ -94,23 +94,30 @@ public class TerminalServiceImpl implements TerminalService { } @Override - @Transactional - public void deleteTerminal(String terminalId) { - // 1. 校验终端是否已绑定设备（使用新增的existsByTerminalId方法） - if (mappingRepository.existsByTerminalId(terminalId)) { +@Transactional +public void deleteTerminal(String terminalId) { + // 1. 检查终端映射记录是否存在 + Optional mappingOpt = mappingRepository.findByTerminalId(terminalId); + + if (mappingOpt.isPresent()) { + // 检查是否实际绑定了设备（deviceId不为null） + DeviceTerminalMapping mapping = mappingOpt.get(); + if (mapping.getDeviceId() != null && !mapping.getDeviceId().isEmpty()) { throw new RuntimeException("终端已绑定设备，无法删除，请先解除设备关联"); } + } - // 2. 校验终端是否存在（复用原有existsById方法） - if (!locationRepository.existsById(terminalId)) { - throw new RuntimeException("终端不存在，无需删除：" + terminalId); - } - - // 3. 级联删除数据（先删映射表，再删位置表，保证数据一致性） - mappingRepository.deleteByTerminalId(terminalId); // 新增的批量删除方法 - locationRepository.deleteById(terminalId); // 复用原有删除方法 + // 2. 校验终端是否存在 + if (!locationRepository.existsById(terminalId)) { + throw new RuntimeException("终端不存在，无需删除：" + terminalId); } + // 3. 级联删除数据 + mappingRepository.deleteByTerminalId(terminalId); + locationRepository.deleteById(terminalId); +} + + @Override public TerminalManageVO getTerminalById(String terminalId) { // 1. 查询位置信息（复用原有findById方法） diff --git a/src/main/resources/web/src/components/layout/AppSidebar.vue b/src/main/resources/web/src/components/layout/AppSidebar.vue index a214368..eecf014 100644 --- a/src/main/resources/web/src/components/layout/AppSidebar.vue +++ b/src/main/resources/web/src/components/layout/AppSidebar.vue @@ -55,7 +55,8 @@ const menuItems: MenuItem[] = [ route: '/home/equipment', children: [ { name: '制水机', route: '/home/equipment/water-maker' }, - { name: '供水机', route: '/home/equipment/water-supplier' } + { name: '供水机', route: '/home/equipment/water-supplier' }, + { name: '终端机', route: '/home/equipment/terminal' } // 添加终端机菜单项 ] }, { diff --git a/src/main/resources/web/src/router/index.ts b/src/main/resources/web/src/router/index.ts index a38c5ed..1589759 100644 --- a/src/main/resources/web/src/router/index.ts +++ b/src/main/resources/web/src/router/index.ts @@ -70,6 +70,17 @@ const router = createRouter({ title: '供水设备' } }, + { + path: '/home/equipment/terminal', + component: () => import('@/views/equipment/Terminal.vue'), + meta: { requiresAuth: true } + }, + { + path: '/home/equipment/terminal/:id', + component: () => import('@/views/equipment/TerminalDetail.vue'), // 如果需要详情页 + meta: { requiresAuth: true } + }, + // 工单管理相关路由 { path: 'work-order', diff --git a/src/main/resources/web/src/views/Dashboard.vue b/src/main/resources/web/src/views/Dashboard.vue index 0b2cd66..8475221 100644 --- a/src/main/resources/web/src/views/Dashboard.vue +++ b/src/main/resources/web/src/views/Dashboard.vue @@ -74,7 +74,7 @@
- +
{{ alert.deviceId }}：{{ alert.alertMessage }}
{{ formatDateTime(alert.timestamp) }}
@@ -244,6 +244,7 @@ const fetchStatsData = async () => { } } +// 获取告警数据 // 获取告警数据 const fetchAlertData = async () => { loadingAlerts.value = true @@ -271,24 +272,25 @@ const fetchAlertData = async () => { // 确保数据是数组 const alerts = Array.isArray(alertResult.data) ? alertResult.data : [] + // 按时间倒序排序（最新的在前面） + const sortedAlerts = [...alerts].sort((a, b) => { + // 将时间字符串转换为Date对象进行比较 + const timeA = new Date(a.timestamp).getTime() + const timeB = new Date(b.timestamp).getTime() + return timeB - timeA // 降序排列（最新的在前） + }) + // 只取前10条 - recentAlerts.value = alerts.slice(0, 10) - - // 如果有告警，设置最新告警 - if (recentAlerts.value.length > 0) { - const sortedAlerts = [...recentAlerts.value].sort((a, b) => { - const priorityMap: Record = { - 'critical': 4, - 'error': 3, - 'warning': 2, - 'info': 1 - }; - return (priorityMap[b.alertLevel?.toLowerCase()] || 0) - (priorityMap[a.alertLevel?.toLowerCase()] || 0); - }); - latestAlert.value = sortedAlerts[0] ?? null; + recentAlerts.value = sortedAlerts.slice(0, 10) + + // 如果有告警，设置最新告警（时间最新的） + // 修改第222行附近的代码 + if (recentAlerts.value.length > 0 && recentAlerts.value[0]) { + latestAlert.value = recentAlerts.value[0] // 第一个是最新时间的告警 } else { - latestAlert.value = null; + latestAlert.value = null } + } } catch (error: any) { console.error('获取告警数据失败:', error) @@ -318,6 +320,7 @@ const fetchAlertData = async () => { } } + // 组件挂载时获取数据 onMounted(() => { fetchStatsData() diff --git a/src/main/resources/web/src/views/area/Campus.vue b/src/main/resources/web/src/views/area/Campus.vue index a922eff..b929fbf 100644 --- a/src/main/resources/web/src/views/area/Campus.vue +++ b/src/main/resources/web/src/views/area/Campus.vue @@ -11,8 +11,7 @@
- - +
@@ -89,6 +88,18 @@
+
+ + +
- + + +
@@ -167,6 +182,18 @@ import { useAuthStore } from '@/stores/auth' // 导入 authStore const router = useRouter() const authStore = useAuthStore() +// 管理员数据接口 +interface Admin { + adminId: string + adminName: string + password: string + phone: string + role: string + areaId: string | null + createdTime?: Date + updatedTime?: Date +} + // 校区数据接口，与后端Area实体对应 interface Area { areaId: string @@ -182,6 +209,9 @@ interface Area { // 响应式数据 const campusList = ref([]) +const cityList = ref([]) +const adminList = ref([]) +const selectedManager = ref(null) const selectedCampus = ref('') const currentPage = ref(1) const pageSize = ref(10) @@ -248,21 +278,47 @@ const fetchCampusList = async () => { return } - const response = await request<{ + // 需要先获取所有市区，然后获取所有校区 + // 方案1: 获取所有市区，然后获取每个市区下的校区 + const citiesResponse = await request<{ code: number msg: string data: Area[] - }>('/api/web/area/list-campus', { + }>('/api/web/area/cities', { method: 'GET', }) - if (response.code === 200) { - campusList.value = response.data - } else { - const errorMsg = response.msg || `获取失败（错误码：${response.code}）` - console.error('获取校区列表失败:', errorMsg) - alert(`获取校区列表失败：${errorMsg}`) + if (citiesResponse?.code !== 200 || !citiesResponse?.data) { + console.error('获取市区列表失败:', citiesResponse?.msg || '未知错误') + alert(`获取市区列表失败：${citiesResponse?.msg || '未知错误'}`) + return + } + + const cities = citiesResponse.data + const allCampuses: Area[] = [] + + // 获取每个市区下的校区 + for (const city of cities) { + try { + const campusResponse = await request<{ + code: number + msg: string + data: Area[] + }>(`/api/web/area/campuses/${city.areaId}`, { + method: 'GET', + }) + + if (campusResponse?.code === 200 && campusResponse?.data) { + allCampuses.push(...campusResponse.data) + } else { + console.warn(`获取市区 ${city.areaName} 的校区失败:`, campusResponse?.msg || '未知错误') + } + } catch (error) { + console.warn(`获取市区 ${city.areaName} 的校区时出错:`, error) + } } + + campusList.value = allCampuses } catch (error: any) { console.error('请求异常:', error) const errorMsg = error.message.includes('401') || error.message.includes('403') @@ -276,6 +332,94 @@ const fetchCampusList = async () => { } } +// 获取市区列表 +const fetchCityList = async () => { + try { + const token = authStore.token + if (!token) { + console.warn('未获取到 Token，跳转到登录页') + router.push('/login') + return + } + + const response = await request<{ + code: number + msg: string + data: Area[] + }>('/api/web/area/cities', { + method: 'GET', + }) + + if (response?.code === 200 && response?.data) { + cityList.value = response.data + } else { + console.error('获取市区列表失败:', response?.msg || '未知错误') + alert(`获取市区列表失败：${response?.msg || '未知错误'}`) + } + } catch (error: any) { + console.error('获取市区列表异常:', error) + const errorMsg = error.message.includes('401') || error.message.includes('403') + ? '权限不足或登录已过期，请重新登录' + : error.message.includes('Network') + ? '网络连接失败，请检查网络' + : error.message || '获取市区列表失败，请稍后重试' + alert(`获取市区列表失败：${errorMsg}`) + } +} + +// 获取区域管理员列表 +// 修改获取管理员列表的函数 +const fetchAdminList = async () => { + try { + const token = authStore.token + if (!token) { + console.warn('未获取到 Token，跳转到登录页') + router.push('/login') + return + } + + // 先获取所有管理员，然后在前端过滤 + const response = await request<{ + code: number + msg: string + data: Admin[] + }>('/api/web/admin/list', { + method: 'GET', + }) + + if (response?.code === 200 && response?.data) { + // 过滤出区域管理员 + const areaAdmins = response.data.filter(admin => + admin.role === 'AREA_ADMIN' || admin.role === 'ROLE_AREA_ADMIN' + ) + adminList.value = areaAdmins + } else { + console.error('获取管理员列表失败:', response?.msg || '未知错误') + alert(`获取管理员列表失败：${response?.msg || '未知错误'}`) + } + } catch (error: any) { + console.error('获取管理员列表异常:', error) + const errorMsg = error.message.includes('401') || error.message.includes('403') + ? '权限不足或登录已过期，请重新登录' + : error.message.includes('Network') + ? '网络连接失败，请检查网络' + : error.message || '获取管理员列表失败，请稍后重试' + alert(`获取管理员列表失败：${errorMsg}`) + } +} + + +// 处理负责人选择变化 +const onManagerChange = () => { + if (selectedManager.value) { + formData.value.manager = selectedManager.value.adminName + formData.value.managerPhone = selectedManager.value.phone + } else { + formData.value.manager = '' + formData.value.managerPhone = '' + } +} + // 新增校区 const handleAddCampus = () => { isEdit.value = false @@ -284,13 +428,14 @@ const handleAddCampus = () => { areaId: '', areaName: '', areaType: 'campus', - parentAreaId: null, + parentAreaId: null, // 重置为null，让用户选择 address: '', manager: '', managerPhone: '', createdTime: undefined, updatedTime: undefined } + selectedManager.value = null showModal.value = true } @@ -298,6 +443,11 @@ const handleAddCampus = () => { const handleEdit = (campus: Area) => { isEdit.value = true formData.value = { ...campus } + + // 尝试匹配现有的负责人 + const matchedAdmin = adminList.value.find(admin => admin.adminName === campus.manager) + selectedManager.value = matchedAdmin || null + showModal.value = true } @@ -326,11 +476,11 @@ const confirmDelete = async () => { method: 'DELETE', }) - if (response.code === 200) { + if (response?.code === 200) { fetchCampusList() // 重新获取列表 showDeleteConfirm.value = false } else { - const errorMsg = response.msg || `删除失败（错误码：${response.code}）` + const errorMsg = response?.msg || `删除失败（错误码：${response?.code || '未知'}）` console.error('删除校区失败:', errorMsg) alert(`删除校区失败：${errorMsg}`) } @@ -358,8 +508,19 @@ const handleSave = async () => { return } + // 校园类型必须有父级区域ID + if (!isEdit.value && (!formData.value.parentAreaId || formData.value.parentAreaId.trim() === '')) { + alert('新增校区时必须选择所属市区') + return + } + + // 必须选择负责人 + if (!selectedManager.value) { + alert('请选择负责人') + return + } + let response - let result if (isEdit.value) { // 编辑模式 @@ -372,11 +533,11 @@ const handleSave = async () => { body: JSON.stringify(formData.value) }) - if (response.code === 200) { + if (response?.code === 200 && response?.data) { fetchCampusList() // 重新获取列表 showModal.value = false } else { - const errorMsg = response.msg || `更新失败（错误码：${response.code}）` + const errorMsg = response?.msg || `更新失败（错误码：${response?.code || '未知'}）` console.error('更新校区失败:', errorMsg) alert(`更新校区失败：${errorMsg}`) } @@ -385,6 +546,7 @@ const handleSave = async () => { const newCampus = { areaName: formData.value.areaName, areaType: 'campus' as const, + parentAreaId: formData.value.parentAreaId, // 必须包含父级区域ID address: formData.value.address, manager: formData.value.manager, managerPhone: formData.value.managerPhone @@ -399,11 +561,11 @@ const handleSave = async () => { body: JSON.stringify(newCampus) }) - if (response.code === 200) { + if (response?.code === 200 && response?.data) { fetchCampusList() // 重新获取列表 showModal.value = false } else { - const errorMsg = response.msg || `新增失败（错误码：${response.code}）` + const errorMsg = response?.msg || `新增失败（错误码：${response?.code || '未知'}）` console.error('新增校区失败:', errorMsg) alert(`新增校区失败：${errorMsg}`) } @@ -421,14 +583,11 @@ const handleSave = async () => { } } -// 导航到片区管理页面 -const goToZoneManagement = () => { - router.push('/area/zone') -} - // 初始化加载数据 -onMounted(() => { +onMounted(async () => { console.log('Token:', authStore.token) + await fetchCityList() // 先加载市区列表 + await fetchAdminList() // 加载管理员列表 fetchCampusList() }) diff --git a/src/main/resources/web/src/views/area/Urban.vue b/src/main/resources/web/src/views/area/Urban.vue index d6e0ce1..724304f 100644 --- a/src/main/resources/web/src/views/area/Urban.vue +++ b/src/main/resources/web/src/views/area/Urban.vue @@ -27,39 +27,39 @@
- - - - - - + + + + + + - - - - - + + + - - - - - - - + > + 删除 + + + + + + + + +
片区设备数量范围操作
片区设备数量范围操作
{{ area.areaName }}{{ area.deviceCount || 0 }}{{ area.address || '未设置' }} - {{ area.areaName }}{{ area.deviceCount || 0 }}{{ area.address || '未设置' }} + - + -
正在加载数据...
暂无片区数据
正在加载数据...
暂无片区数据
@@ -67,9 +67,9 @@