feat(wm-base): #74 系统管理完整实现

- 新增数据字典管理（SysDictType/SysDictData entity + mapper + service + controller）
  - 字典类型CRUD + 字典数据CRUD + 本地ConcurrentHashMap缓存
  - SysDictionaryController /api/base/sys/dict
- 新增操作日志管理（SysOperationLog entity + mapper + service + controller）
  - 日志记录 + 分页查询（按用户/模块/操作/状态/时间筛选）+ CSV导出 + 清空
  - SysOperationLogController /api/base/sys/log
- 完善SysRoleService：5级角色预设 + 权限矩阵
  - admin/supervisor/biz_manager/field_ops/tech_maintain
  - 预设初始化接口 + 权限矩阵查询接口
- 完善SysRoleController：新增presets/permissions/init-presets端点
- SQL DDL: V_sys_dict_log.sql（建表+索引+预设角色+预设字典数据）
- 前端新增/完善：
  - UserList.vue（用户CRUD + 搜索 + 状态切换）
  - RoleList.vue（角色CRUD + 预设查看 + 权限矩阵查看）
  - DeptList.vue（部门树 + CRUD + 类型选择）
  - MenuList.vue（菜单树 + CRUD + 类型切换）
  - DictionaryView.vue（左右布局：字典类型列表 + 字典数据列表）
  - OperationLogView.vue（多条件筛选 + 详情 + CSV导出 + 清空）
  - system.ts API模块
  - router路由更新
- 单元测试：SysDictionaryServiceTest/SysRoleServiceTest/SysDeptServiceTest/SysOperationLogServiceTest

frontend/src/api/system.ts

@@ -0,0 +1,131 @@
+import request from './request'
+
+// ============ 用户管理 ============
+export function getUserList(page = 1, size = 10, username?: string) {
+  return request.get('/base/sys/user/list', { params: { page, size, username } })
+}
+export function getUserById(id: number) {
+  return request.get(`/base/sys/user/${id}`)
+}
+export function createUser(data: any) {
+  return request.post('/base/sys/user', data)
+}
+export function updateUser(id: number, data: any) {
+  return request.put(`/base/sys/user/${id}`, data)
+}
+export function toggleUserStatus(id: number, status: number) {
+  return request.put(`/base/sys/user/${id}/status?status=${status}`)
+}
+
+// ============ 角色管理 ============
+export function getRoleList(page = 1, size = 10) {
+  return request.get('/base/sys/role/list', { params: { page, size } })
+}
+export function getRoleById(id: number) {
+  return request.get(`/base/sys/role/${id}`)
+}
+export function createRole(data: any) {
+  return request.post('/base/sys/role', data)
+}
+export function updateRole(id: number, data: any) {
+  return request.put(`/base/sys/role/${id}`, data)
+}
+export function deleteRole(id: number) {
+  return request.delete(`/base/sys/role/${id}`)
+}
+export function getRolePresets() {
+  return request.get('/base/sys/role/presets')
+}
+export function getRolePermissions(roleKey: string) {
+  return request.get(`/base/sys/role/permissions/${roleKey}`)
+}
+export function initRolePresets() {
+  return request.post('/base/sys/role/init-presets')
+}
+
+// ============ 部门管理 ============
+export function getDeptTree() {
+  return request.get('/base/sys/dept/tree')
+}
+export function createDept(data: any) {
+  return request.post('/base/sys/dept', data)
+}
+export function updateDept(id: number, data: any) {
+  return request.put(`/base/sys/dept/${id}`, data)
+}
+export function deleteDept(id: number) {
+  return request.delete(`/base/sys/dept/${id}`)
+}
+
+// ============ 菜单管理 ============
+export function getMenuTree() {
+  return request.get('/base/sys/menu/tree')
+}
+export function getMenuList() {
+  return request.get('/base/sys/menu/list')
+}
+export function createMenu(data: any) {
+  return request.post('/base/sys/menu', data)
+}
+export function updateMenu(id: number, data: any) {
+  return request.put(`/base/sys/menu/${id}`, data)
+}
+export function deleteMenu(id: number) {
+  return request.delete(`/base/sys/menu/${id}`)
+}
+
+// ============ 数据字典 ============
+export function getDictTypes(dictName?: string) {
+  return request.get('/base/sys/dict/type/list', { params: { dictName } })
+}
+export function getDictTypeById(id: number) {
+  return request.get(`/base/sys/dict/type/${id}`)
+}
+export function createDictType(data: any) {
+  return request.post('/base/sys/dict/type', data)
+}
+export function updateDictType(id: number, data: any) {
+  return request.put(`/base/sys/dict/type/${id}`, data)
+}
+export function deleteDictType(id: number) {
+  return request.delete(`/base/sys/dict/type/${id}`)
+}
+export function getDictData(typeId: number) {
+  return request.get('/base/sys/dict/data/list', { params: { typeId } })
+}
+export function getDictDataByKey(dictKey: string) {
+  return request.get(`/base/sys/dict/data/key/${dictKey}`)
+}
+export function createDictData(data: any) {
+  return request.post('/base/sys/dict/data', data)
+}
+export function updateDictData(id: number, data: any) {
+  return request.put(`/base/sys/dict/data/${id}`, data)
+}
+export function deleteDictData(id: number) {
+  return request.delete(`/base/sys/dict/data/${id}`)
+}
+export function clearDictCache() {
+  return request.post('/base/sys/dict/cache/clear')
+}
+
+// ============ 操作日志 ============
+export function getLogList(params: {
+  page?: number; size?: number;
+  username?: string; module?: string;
+  operation?: string; status?: number;
+  startTime?: string; endTime?: string
+}) {
+  return request.get('/base/sys/log/list', { params })
+}
+export function getLogById(id: number) {
+  return request.get(`/base/sys/log/${id}`)
+}
+export function getLogExportUrl(params: Record<string, any> = {}) {
+  const query = new URLSearchParams()
+  Object.entries(params).forEach(([k, v]) => { if (v) query.set(k, String(v)) })
+  return `/api/base/sys/log/export?${query.toString()}`
+}
+export function cleanLogs() {
+  return request.delete('/base/sys/log/clean')
+}

frontend/src/router/index.ts

@@ -11,6 +11,8 @@ const routes = [
       { path: 'system/role', name: 'role', component: () => import('@/views/system/role/RoleList.vue') },
       { path: 'system/menu', name: 'menu', component: () => import('@/views/system/menu/MenuList.vue') },
       { path: 'system/dept', name: 'dept', component: () => import('@/views/system/dept/DeptList.vue') },
+      { path: 'system/dict', name: 'dict', component: () => import('@/views/system/dict/DictionaryView.vue') },
+      { path: 'system/log', name: 'log', component: () => import('@/views/system/log/OperationLogView.vue') },
       { path: 'dispatch-command', name: 'dispatchCommandList', component: () => import('@/views/dispatch-command/CommandList.vue') },
       { path: 'dispatch-command/:id', name: 'dispatchCommandDetail', component: () => import('@/views/dispatch-command/CommandDetail.vue') },
     ]

frontend/src/views/system/dept/DeptList.vue

@@ -0,0 +1,142 @@
+<template>
+  <div class="page-container">
+    <el-card shadow="never">
+      <template #header>
+        <div class="card-header">
+          <span>部门管理</span>
+          <el-button type="primary" @click="openDialog()">新增部门</el-button>
+        </div>
+      </template>
+
+      <el-table :data="treeData" row-key="id" border default-expand-all>
+        <el-table-column prop="deptName" label="部门名称" min-width="200" />
+        <el-table-column prop="deptType" label="部门类型" width="120">
+          <template #default="{ row }">
+            <el-tag>{{ typeMap[row.deptType] || row.deptType }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="leader" label="负责人" width="100" />
+        <el-table-column prop="phone" label="联系电话" width="130" />
+        <el-table-column prop="sortOrder" label="排序" width="70" />
+        <el-table-column prop="status" label="状态" width="80">
+          <template #default="{ row }">
+            <el-tag :type="row.status === 1 ? 'success' : 'danger'">{{ row.status === 1 ? '启用' : '停用' }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="180" fixed="right">
+          <template #default="{ row }">
+            <el-button link type="primary" @click="openDialog(row)">编辑</el-button>
+            <el-button link type="danger" @click="handleDelete(row.id)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+
+    <el-dialog v-model="dialogVisible" :title="isEdit ? '编辑部门' : '新增部门'" width="500px">
+      <el-form :model="form" label-width="80px">
+        <el-form-item label="上级部门">
+          <el-tree-select
+            v-model="form.parentId"
+            :data="treeSelectData"
+            :props="{ label: 'deptName', value: 'id', children: 'children' }"
+            check-strictly
+            placeholder="选择上级部门（留空为顶级）"
+            clearable
+            style="width: 100%"
+          />
+        </el-form-item>
+        <el-form-item label="部门名称" required>
+          <el-input v-model="form.deptName" />
+        </el-form-item>
+        <el-form-item label="部门类型">
+          <el-select v-model="form.deptType">
+            <el-option label="水利局" value="water_bureau" />
+            <el-option label="水务公司" value="water_company" />
+            <el-option label="运维单位" value="ops" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="负责人">
+          <el-input v-model="form.leader" />
+        </el-form-item>
+        <el-form-item label="联系电话">
+          <el-input v-model="form.phone" />
+        </el-form-item>
+        <el-form-item label="排序">
+          <el-input-number v-model="form.sortOrder" :min="0" />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-switch v-model="form.status" :active-value="1" :inactive-value="0" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button @click="dialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="handleSubmit">确定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, computed, onMounted } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { getDeptTree, createDept, updateDept, deleteDept } from '@/api/system'
+
+const typeMap: Record<string, string> = { water_bureau: '水利局', water_company: '水务公司', ops: '运维单位' }
+
+const treeData = ref<any[]>([])
+const dialogVisible = ref(false)
+const isEdit = ref(false)
+const editId = ref<number>(0)
+
+const defaultForm = { parentId: null as number | null, deptName: '', deptType: 'water_company', leader: '', phone: '', sortOrder: 0, status: 1 }
+const form = reactive({ ...defaultForm })
+
+const treeSelectData = computed(() => [{ id: 0, deptName: '顶级部门', children: treeData.value }])
+
+function loadData() {
+  getDeptTree().then((res: any) => {
+    treeData.value = res.data
+  })
+}
+
+function openDialog(row?: any) {
+  if (row) {
+    isEdit.value = true
+    editId.value = row.id
+    Object.assign(form, row)
+  } else {
+    isEdit.value = false
+    editId.value = 0
+    Object.assign(form, defaultForm)
+  }
+  dialogVisible.value = true
+}
+
+function handleSubmit() {
+  if (!form.deptName) { ElMessage.warning('请输入部门名称'); return }
+  const action = isEdit.value
+    ? updateDept(editId.value, form)
+    : createDept(form)
+  action.then(() => {
+    ElMessage.success(isEdit.value ? '更新成功' : '创建成功')
+    dialogVisible.value = false
+    loadData()
+  })
+}
+
+function handleDelete(id: number) {
+  ElMessageBox.confirm('确认删除该部门? 子部门也将被删除', '提示', { type: 'warning' }).then(() => {
+    deleteDept(id).then(() => {
+      ElMessage.success('删除成功')
+      loadData()
+    })
+  })
+}
+
+onMounted(loadData)
+</script>
+
+<style scoped>
+.page-container { padding: 16px; }
+.card-header { display: flex; justify-content: space-between; align-items: center; }
+</style>

frontend/src/views/system/dept/部门List.vue

@@ -1,22 +0,0 @@
-<template>
-  <div>
-    <el-button type="primary" @click="dialogVisible=true">新增部门</el-button>
-    <el-table :data="tableData" style="margin-top:10px" border>
-      <el-table-column prop="id" label="ID" width="80" />
-      <el-table-column prop="name" label="名称" />
-      <el-table-column label="操作" width="180">
-        <template #default>
-          <el-button link type="primary">编辑</el-button>
-          <el-button link type="danger">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-dialog v-model="dialogVisible" title="新增部门"><span>表单内容待实现</span></el-dialog>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref } from 'vue'
-const dialogVisible = ref(false)
-const tableData = ref<Array<{id:number,name:string}>>([])
-</script>

frontend/src/views/system/dict/DictionaryView.vue

@@ -0,0 +1,257 @@
+<template>
+  <div class="page-container">
+    <el-row :gutter="16">
+      <!-- 左侧：字典类型 -->
+      <el-col :span="10">
+        <el-card shadow="never">
+          <template #header>
+            <div class="card-header">
+              <span>字典类型</span>
+              <div>
+                <el-button size="small" @click="clearCache">清空缓存</el-button>
+                <el-button size="small" type="primary" @click="openTypeDialog()">新增</el-button>
+              </div>
+            </div>
+          </template>
+
+          <el-form :inline="true" @submit.prevent="loadTypes">
+            <el-form-item>
+              <el-input v-model="searchName" placeholder="搜索字典名称" clearable @clear="loadTypes" />
+            </el-form-item>
+          </el-form>
+
+          <el-table :data="types" border highlight-current-row @current-change="onTypeSelect" style="margin-top: 10px">
+            <el-table-column prop="dictName" label="字典名称" />
+            <el-table-column prop="dictKey" label="字典标识" width="150" />
+            <el-table-column prop="status" label="状态" width="70">
+              <template #default="{ row }">
+                <el-tag :type="row.status === 1 ? 'success' : 'danger'" size="small">{{ row.status === 1 ? '启用' : '停用' }}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="110">
+              <template #default="{ row }">
+                <el-button link type="primary" @click.stop="openTypeDialog(row)">编辑</el-button>
+                <el-button link type="danger" @click.stop="handleDeleteType(row.id)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+      </el-col>
+
+      <!-- 右侧：字典数据 -->
+      <el-col :span="14">
+        <el-card shadow="never">
+          <template #header>
+            <div class="card-header">
+              <span>字典数据 <el-tag v-if="selectedType" size="small" type="info">{{ selectedType.dictName }}</el-tag></span>
+              <el-button size="small" type="primary" :disabled="!selectedType" @click="openDataDialog()">新增</el-button>
+            </div>
+          </template>
+
+          <el-table :data="dataList" border>
+            <el-table-column prop="dictLabel" label="标签" />
+            <el-table-column prop="dictValue" label="值" width="120" />
+            <el-table-column prop="sortOrder" label="排序" width="70" />
+            <el-table-column prop="status" label="状态" width="70">
+              <template #default="{ row }">
+                <el-tag :type="row.status === 1 ? 'success' : 'danger'" size="small">{{ row.status === 1 ? '启用' : '停用' }}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column prop="remark" label="备注" />
+            <el-table-column label="操作" width="110">
+              <template #default="{ row }">
+                <el-button link type="primary" @click="openDataDialog(row)">编辑</el-button>
+                <el-button link type="danger" @click="handleDeleteData(row.id)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+      </el-col>
+    </el-row>
+
+    <!-- 字典类型对话框 -->
+    <el-dialog v-model="typeDialogVisible" :title="isTypeEdit ? '编辑字典类型' : '新增字典类型'" width="450px">
+      <el-form :model="typeForm" label-width="80px">
+        <el-form-item label="字典名称" required>
+          <el-input v-model="typeForm.dictName" />
+        </el-form-item>
+        <el-form-item label="字典标识" required>
+          <el-input v-model="typeForm.dictKey" :disabled="isTypeEdit" />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-switch v-model="typeForm.status" :active-value="1" :inactive-value="0" />
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input v-model="typeForm.remark" type="textarea" :rows="2" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button @click="typeDialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="handleSubmitType">确定</el-button>
+      </template>
+    </el-dialog>
+
+    <!-- 字典数据对话框 -->
+    <el-dialog v-model="dataDialogVisible" :title="isDataEdit ? '编辑字典数据' : '新增字典数据'" width="450px">
+      <el-form :model="dataForm" label-width="80px">
+        <el-form-item label="标签" required>
+          <el-input v-model="dataForm.dictLabel" />
+        </el-form-item>
+        <el-form-item label="值" required>
+          <el-input v-model="dataForm.dictValue" />
+        </el-form-item>
+        <el-form-item label="CSS Class">
+          <el-input v-model="dataForm.cssClass" />
+        </el-form-item>
+        <el-form-item label="排序">
+          <el-input-number v-model="dataForm.sortOrder" :min="0" />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-switch v-model="dataForm.status" :active-value="1" :inactive-value="0" />
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input v-model="dataForm.remark" type="textarea" :rows="2" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button @click="dataDialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="handleSubmitData">确定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, onMounted } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import {
+  getDictTypes, createDictType, updateDictType, deleteDictType,
+  getDictData, createDictData, updateDictData, deleteDictData,
+  clearDictCache
+} from '@/api/system'
+
+const searchName = ref('')
+const types = ref<any[]>([])
+const selectedType = ref<any>(null)
+const dataList = ref<any[]>([])
+
+// 字典类型表单
+const typeDialogVisible = ref(false)
+const isTypeEdit = ref(false)
+const typeEditId = ref<number>(0)
+const typeForm = reactive({ dictName: '', dictKey: '', status: 1, remark: '' })
+
+// 字典数据表单
+const dataDialogVisible = ref(false)
+const isDataEdit = ref(false)
+const dataEditId = ref<number>(0)
+const dataForm = reactive({ dictLabel: '', dictValue: '', cssClass: '', sortOrder: 0, status: 1, remark: '' })
+
+function loadTypes() {
+  getDictTypes(searchName.value || undefined).then((res: any) => {
+    types.value = res.data
+  })
+}
+
+function onTypeSelect(row: any) {
+  selectedType.value = row
+  if (row) {
+    loadDataList(row.id)
+  } else {
+    dataList.value = []
+  }
+}
+
+function loadDataList(typeId: number) {
+  getDictData(typeId).then((res: any) => {
+    dataList.value = res.data
+  })
+}
+
+// ============ 字典类型操作 ============
+function openTypeDialog(row?: any) {
+  if (row) {
+    isTypeEdit.value = true
+    typeEditId.value = row.id
+    Object.assign(typeForm, row)
+  } else {
+    isTypeEdit.value = false
+    typeEditId.value = 0
+    Object.assign(typeForm, { dictName: '', dictKey: '', status: 1, remark: '' })
+  }
+  typeDialogVisible.value = true
+}
+
+function handleSubmitType() {
+  if (!typeForm.dictName || !typeForm.dictKey) { ElMessage.warning('请填写完整信息'); return }
+  const action = isTypeEdit.value
+    ? updateDictType(typeEditId.value, typeForm)
+    : createDictType(typeForm)
+  action.then(() => {
+    ElMessage.success(isTypeEdit.value ? '更新成功' : '创建成功')
+    typeDialogVisible.value = false
+    loadTypes()
+  })
+}
+
+function handleDeleteType(id: number) {
+  ElMessageBox.confirm('删除字典类型将同时删除所有关联数据，确认?', '提示', { type: 'warning' }).then(() => {
+    deleteDictType(id).then(() => {
+      ElMessage.success('删除成功')
+      selectedType.value = null
+      dataList.value = []
+      loadTypes()
+    })
+  })
+}
+
+// ============ 字典数据操作 ============
+function openDataDialog(row?: any) {
+  if (!selectedType.value) return
+  if (row) {
+    isDataEdit.value = true
+    dataEditId.value = row.id
+    Object.assign(dataForm, row)
+  } else {
+    isDataEdit.value = false
+    dataEditId.value = 0
+    Object.assign(dataForm, { dictLabel: '', dictValue: '', cssClass: '', sortOrder: 0, status: 1, remark: '' })
+  }
+  dataDialogVisible.value = true
+}
+
+function handleSubmitData() {
+  if (!dataForm.dictLabel || !dataForm.dictValue) { ElMessage.warning('请填写完整信息'); return }
+  const payload = { ...dataForm, dictTypeId: selectedType.value.id }
+  const action = isDataEdit.value
+    ? updateDictData(dataEditId.value, payload)
+    : createDictData(payload)
+  action.then(() => {
+    ElMessage.success(isDataEdit.value ? '更新成功' : '创建成功')
+    dataDialogVisible.value = false
+    loadDataList(selectedType.value.id)
+  })
+}
+
+function handleDeleteData(id: number) {
+  ElMessageBox.confirm('确认删除该字典数据?', '提示', { type: 'warning' }).then(() => {
+    deleteDictData(id).then(() => {
+      ElMessage.success('删除成功')
+      loadDataList(selectedType.value.id)
+    })
+  })
+}
+
+function clearCache() {
+  clearDictCache().then(() => {
+    ElMessage.success('缓存已清空')
+  })
+}
+
+onMounted(loadTypes)
+</script>
+
+<style scoped>
+.page-container { padding: 16px; }
+.card-header { display: flex; justify-content: space-between; align-items: center; }
+</style>

frontend/src/views/system/log/OperationLogView.vue

@@ -0,0 +1,208 @@
+<template>
+  <div class="page-container">
+    <el-card shadow="never">
+      <template #header>
+        <div class="card-header">
+          <span>操作日志</span>
+          <div>
+            <el-button @click="handleExport">导出CSV</el-button>
+            <el-popconfirm title="确认清空所有日志?" @confirm="handleClean">
+              <template #reference>
+                <el-button type="danger">清空日志</el-button>
+              </template>
+            </el-popconfirm>
+          </div>
+        </div>
+      </template>
+
+      <!-- 筛选区 -->
+      <el-form :inline="true" @submit.prevent="loadData">
+        <el-form-item label="用户">
+          <el-input v-model="searchForm.username" placeholder="用户名" clearable style="width: 120px" />
+        </el-form-item>
+        <el-form-item label="模块">
+          <el-select v-model="searchForm.module" clearable placeholder="全部" style="width: 130px">
+            <el-option label="系统管理" value="系统管理" />
+            <el-option label="监控中心" value="监控中心" />
+            <el-option label="生产管理" value="生产管理" />
+            <el-option label="调度指挥" value="调度指挥" />
+            <el-option label="营收管理" value="营收管理" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="操作">
+          <el-input v-model="searchForm.operation" placeholder="操作名称" clearable style="width: 120px" />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-select v-model="searchForm.status" clearable placeholder="全部" style="width: 100px">
+            <el-option label="成功" :value="1" />
+            <el-option label="失败" :value="0" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间范围">
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            style="width: 360px"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="loadData">搜索</el-button>
+          <el-button @click="resetSearch">重置</el-button>
+        </el-form-item>
+      </el-form>
+
+      <el-table :data="tableData" border stripe style="width: 100%; margin-top: 10px">
+        <el-table-column prop="id" label="ID" width="70" />
+        <el-table-column prop="username" label="用户" width="100" />
+        <el-table-column prop="module" label="模块" width="100" />
+        <el-table-column prop="operation" label="操作" width="120" />
+        <el-table-column prop="requestMethod" label="方式" width="70">
+          <template #default="{ row }">
+            <el-tag size="small">{{ row.requestMethod }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="requestUrl" label="请求URL" min-width="200" show-overflow-tooltip />
+        <el-table-column prop="duration" label="耗时" width="90">
+          <template #default="{ row }">
+            {{ row.duration }}ms
+          </template>
+        </el-table-column>
+        <el-table-column prop="status" label="状态" width="80">
+          <template #default="{ row }">
+            <el-tag :type="row.status === 1 ? 'success' : 'danger'" size="small">{{ row.status === 1 ? '成功' : '失败' }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createdAt" label="时间" width="170" />
+        <el-table-column label="操作" width="80" fixed="right">
+          <template #default="{ row }">
+            <el-button link type="primary" @click="viewDetail(row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-pagination
+        v-model:current-page="pagination.page"
+        v-model:page-size="pagination.size"
+        :total="pagination.total"
+        :page-sizes="[10, 20, 50, 100]"
+        layout="total, sizes, prev, pager, next"
+        style="margin-top: 15px; justify-content: flex-end"
+        @size-change="loadData"
+        @current-change="loadData"
+      />
+    </el-card>
+
+    <!-- 详情对话框 -->
+    <el-dialog v-model="detailVisible" title="日志详情" width="700px">
+      <el-descriptions :column="2" border v-if="detailData">
+        <el-descriptions-item label="ID">{{ detailData.id }}</el-descriptions-item>
+        <el-descriptions-item label="用户">{{ detailData.username }}</el-descriptions-item>
+        <el-descriptions-item label="模块">{{ detailData.module }}</el-descriptions-item>
+        <el-descriptions-item label="操作">{{ detailData.operation }}</el-descriptions-item>
+        <el-descriptions-item label="请求方式">{{ detailData.requestMethod }}</el-descriptions-item>
+        <el-descriptions-item label="耗时">{{ detailData.duration }}ms</el-descriptions-item>
+        <el-descriptions-item label="请求URL" :span="2">{{ detailData.requestUrl }}</el-descriptions-item>
+        <el-descriptions-item label="IP">{{ detailData.ip }}</el-descriptions-item>
+        <el-descriptions-item label="状态">
+          <el-tag :type="detailData.status === 1 ? 'success' : 'danger'">{{ detailData.status === 1 ? '成功' : '失败' }}</el-tag>
+        </el-descriptions-item>
+        <el-descriptions-item label="请求参数" :span="2">
+          <div class="code-block">{{ detailData.requestParams }}</div>
+        </el-descriptions-item>
+        <el-descriptions-item label="返回结果" :span="2">
+          <div class="code-block">{{ detailData.responseResult }}</div>
+        </el-descriptions-item>
+        <el-descriptions-item label="错误信息" :span="2" v-if="detailData.errorMsg">
+          <div class="code-block error">{{ detailData.errorMsg }}</div>
+        </el-descriptions-item>
+      </el-descriptions>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, onMounted } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getLogList, getLogById, getLogExportUrl, cleanLogs } from '@/api/system'
+
+const searchForm = reactive({ username: '', module: '', operation: '', status: undefined as number | undefined })
+const timeRange = ref<[string, string] | null>(null)
+const tableData = ref<any[]>([])
+const pagination = reactive({ page: 1, size: 20, total: 0 })
+const detailVisible = ref(false)
+const detailData = ref<any>(null)
+
+function getSearchParams() {
+  const params: Record<string, any> = {}
+  if (searchForm.username) params.username = searchForm.username
+  if (searchForm.module) params.module = searchForm.module
+  if (searchForm.operation) params.operation = searchForm.operation
+  if (searchForm.status !== undefined) params.status = searchForm.status
+  if (timeRange.value) {
+    params.startTime = timeRange.value[0]
+    params.endTime = timeRange.value[1]
+  }
+  return params
+}
+
+function loadData() {
+  const params = getSearchParams()
+  getLogList({ page: pagination.page, size: pagination.size, ...params }).then((res: any) => {
+    tableData.value = res.data.records
+    pagination.total = res.data.total
+  })
+}
+
+function resetSearch() {
+  searchForm.username = ''
+  searchForm.module = ''
+  searchForm.operation = ''
+  searchForm.status = undefined
+  timeRange.value = null
+  pagination.page = 1
+  loadData()
+}
+
+function viewDetail(row: any) {
+  getLogById(row.id).then((res: any) => {
+    detailData.value = res.data
+    detailVisible.value = true
+  })
+}
+
+function handleExport() {
+  const params = getSearchParams()
+  const url = getLogExportUrl(params)
+  window.open(url, '_blank')
+}
+
+function handleClean() {
+  cleanLogs().then(() => {
+    ElMessage.success('日志已清空')
+    loadData()
+  })
+}
+
+onMounted(loadData)
+</script>
+
+<style scoped>
+.page-container { padding: 16px; }
+.card-header { display: flex; justify-content: space-between; align-items: center; }
+.code-block {
+  background: #f5f7fa;
+  padding: 8px;
+  border-radius: 4px;
+  font-family: monospace;
+  font-size: 12px;
+  white-space: pre-wrap;
+  word-break: break-all;
+  max-height: 200px;
+  overflow-y: auto;
+}
+.code-block.error { background: #fef0f0; color: #f56c6c; }
+</style>

frontend/src/views/system/menu/MenuList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div class="page-container">
+    <el-card shadow="never">
+      <template #header>
+        <div class="card-header">
+          <span>菜单管理</span>
+          <el-button type="primary" @click="openDialog()">新增菜单</el-button>
+        </div>
+      </template>
+
+      <el-table :data="treeData" row-key="id" border default-expand-all>
+        <el-table-column prop="menuName" label="菜单名称" min-width="180" />
+        <el-table-column prop="menuType" label="类型" width="70">
+          <template #default="{ row }">
+            <el-tag :type="menuTypeMap[row.menuType]?.type || 'info'">{{ menuTypeMap[row.menuType]?.label || row.menuType }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="icon" label="图标" width="80" />
+        <el-table-column prop="path" label="路径" min-width="150" />
+        <el-table-column prop="component" label="组件" min-width="150" />
+        <el-table-column prop="perms" label="权限标识" min-width="150" />
+        <el-table-column prop="sortOrder" label="排序" width="70" />
+        <el-table-column prop="visible" label="可见" width="70">
+          <template #default="{ row }">
+            <el-tag :type="row.visible === 1 ? 'success' : 'info'">{{ row.visible === 1 ? '是' : '否' }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="status" label="状态" width="70">
+          <template #default="{ row }">
+            <el-tag :type="row.status === 1 ? 'success' : 'danger'">{{ row.status === 1 ? '启用' : '停用' }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="180" fixed="right">
+          <template #default="{ row }">
+            <el-button link type="primary" @click="openDialog(row)">编辑</el-button>
+            <el-button link type="danger" @click="handleDelete(row.id)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+
+    <el-dialog v-model="dialogVisible" :title="isEdit ? '编辑菜单' : '新增菜单'" width="600px">
+      <el-form :model="form" label-width="80px">
+        <el-form-item label="菜单类型">
+          <el-radio-group v-model="form.menuType">
+            <el-radio value="M">目录</el-radio>
+            <el-radio value="C">菜单</el-radio>
+            <el-radio value="F">按钮</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="上级菜单">
+          <el-tree-select
+            v-model="form.parentId"
+            :data="treeSelectData"
+            :props="{ label: 'menuName', value: 'id', children: 'children' }"
+            check-strictly
+            placeholder="选择上级菜单（留空为顶级）"
+            clearable
+            style="width: 100%"
+          />
+        </el-form-item>
+        <el-form-item label="菜单名称" required>
+          <el-input v-model="form.menuName" />
+        </el-form-item>
+        <el-form-item label="图标" v-if="form.menuType !== 'F'">
+          <el-input v-model="form.icon" />
+        </el-form-item>
+        <el-form-item label="路由路径" v-if="form.menuType !== 'F'">
+          <el-input v-model="form.path" />
+        </el-form-item>
+        <el-form-item label="组件路径" v-if="form.menuType === 'C'">
+          <el-input v-model="form.component" />
+        </el-form-item>
+        <el-form-item label="权限标识" v-if="form.menuType !== 'M'">
+          <el-input v-model="form.perms" />
+        </el-form-item>
+        <el-form-item label="排序">
+          <el-input-number v-model="form.sortOrder" :min="0" />
+        </el-form-item>
+        <el-form-item label="可见" v-if="form.menuType !== 'F'">
+          <el-switch v-model="form.visible" :active-value="1" :inactive-value="0" />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-switch v-model="form.status" :active-value="1" :inactive-value="0" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button @click="dialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="handleSubmit">确定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, computed, onMounted } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { getMenuTree, createMenu, updateMenu, deleteMenu } from '@/api/system'
+
+const menuTypeMap: Record<string, { label: string; type: string }> = {
+  M: { label: '目录', type: '' },
+  C: { label: '菜单', type: 'success' },
+  F: { label: '按钮', type: 'warning' }
+}
+
+const treeData = ref<any[]>([])
+const dialogVisible = ref(false)
+const isEdit = ref(false)
+const editId = ref<number>(0)
+
+const defaultForm = { parentId: null as number | null, menuName: '', menuType: 'M', path: '', component: '', perms: '', icon: '', sortOrder: 0, visible: 1, status: 1 }
+const form = reactive({ ...defaultForm })
+
+const treeSelectData = computed(() => [{ id: 0, menuName: '顶级菜单', children: treeData.value }])
+
+function loadData() {
+  getMenuTree().then((res: any) => {
+    treeData.value = res.data
+  })
+}
+
+function openDialog(row?: any) {
+  if (row) {
+    isEdit.value = true
+    editId.value = row.id
+    Object.assign(form, row)
+  } else {
+    isEdit.value = false
+    editId.value = 0
+    Object.assign(form, defaultForm)
+  }
+  dialogVisible.value = true
+}
+
+function handleSubmit() {
+  if (!form.menuName) { ElMessage.warning('请输入菜单名称'); return }
+  const action = isEdit.value
+    ? updateMenu(editId.value, form)
+    : createMenu(form)
+  action.then(() => {
+    ElMessage.success(isEdit.value ? '更新成功' : '创建成功')
+    dialogVisible.value = false
+    loadData()
+  })
+}
+
+function handleDelete(id: number) {
+  ElMessageBox.confirm('确认删除该菜单?', '提示', { type: 'warning' }).then(() => {
+    deleteMenu(id).then(() => {
+      ElMessage.success('删除成功')
+      loadData()
+    })
+  })
+}
+
+onMounted(loadData)
+</script>
+
+<style scoped>
+.page-container { padding: 16px; }
+.card-header { display: flex; justify-content: space-between; align-items: center; }
+</style>

frontend/src/views/system/menu/菜单List.vue

@@ -1,22 +0,0 @@
-<template>
-  <div>
-    <el-button type="primary" @click="dialogVisible=true">新增菜单</el-button>
-    <el-table :data="tableData" style="margin-top:10px" border>
-      <el-table-column prop="id" label="ID" width="80" />
-      <el-table-column prop="name" label="名称" />
-      <el-table-column label="操作" width="180">
-        <template #default>
-          <el-button link type="primary">编辑</el-button>
-          <el-button link type="danger">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-dialog v-model="dialogVisible" title="新增菜单"><span>表单内容待实现</span></el-dialog>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref } from 'vue'
-const dialogVisible = ref(false)
-const tableData = ref<Array<{id:number,name:string}>>([])
-</script>

frontend/src/views/system/role/RoleList.vue

@@ -0,0 +1,197 @@
+<template>
+  <div class="page-container">
+    <el-card shadow="never">
+      <template #header>
+        <div class="card-header">
+          <span>角色管理</span>
+          <div>
+            <el-button @click="loadPresets">查看预设</el-button>
+            <el-button type="primary" @click="openDialog()">新增角色</el-button>
+          </div>
+        </div>
+      </template>
+
+      <el-table :data="tableData" border stripe style="width: 100%">
+        <el-table-column prop="id" label="ID" width="70" />
+        <el-table-column prop="roleName" label="角色名称" width="120" />
+        <el-table-column prop="roleKey" label="角色标识" width="130">
+          <template #default="{ row }">
+            <el-tag type="info">{{ row.roleKey }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="roleSort" label="排序" width="70" />
+        <el-table-column prop="dataScope" label="数据范围" width="100">
+          <template #default="{ row }">
+            <el-tag :type="scopeTypeMap[row.dataScope] || 'info'">{{ scopeLabelMap[row.dataScope] || row.dataScope }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="status" label="状态" width="80">
+          <template #default="{ row }">
+            <el-tag :type="row.status === 1 ? 'success' : 'danger'">{{ row.status === 1 ? '启用' : '停用' }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="remark" label="备注" />
+        <el-table-column label="操作" width="180" fixed="right">
+          <template #default="{ row }">
+            <el-button link type="primary" @click="openDialog(row)">编辑</el-button>
+            <el-button link type="primary" @click="viewPermissions(row.roleKey)">权限</el-button>
+            <el-button link type="danger" @click="handleDelete(row.id)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-pagination
+        v-model:current-page="pagination.page"
+        v-model:page-size="pagination.size"
+        :total="pagination.total"
+        :page-sizes="[10, 20, 50]"
+        layout="total, sizes, prev, pager, next"
+        style="margin-top: 15px; justify-content: flex-end"
+        @size-change="loadData"
+        @current-change="loadData"
+      />
+    </el-card>
+
+    <el-dialog v-model="dialogVisible" :title="isEdit ? '编辑角色' : '新增角色'" width="500px">
+      <el-form :model="form" label-width="80px">
+        <el-form-item label="角色名称" required>
+          <el-input v-model="form.roleName" />
+        </el-form-item>
+        <el-form-item label="角色标识" required>
+          <el-input v-model="form.roleKey" :disabled="isEdit" />
+        </el-form-item>
+        <el-form-item label="排序">
+          <el-input-number v-model="form.roleSort" :min="0" />
+        </el-form-item>
+        <el-form-item label="数据范围">
+          <el-select v-model="form.dataScope">
+            <el-option label="全部数据" value="ALL" />
+            <el-option label="部门数据" value="DEPT" />
+            <el-option label="自定义" value="CUSTOM" />
+            <el-option label="仅本人" value="SELF" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-switch v-model="form.status" :active-value="1" :inactive-value="0" />
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input v-model="form.remark" type="textarea" :rows="3" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button @click="dialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="handleSubmit">确定</el-button>
+      </template>
+    </el-dialog>
+
+    <el-dialog v-model="presetVisible" title="5级角色预设" width="700px">
+      <el-table :data="presets" border>
+        <el-table-column prop="roleName" label="角色名称" width="120" />
+        <el-table-column prop="roleKey" label="标识" width="120" />
+        <el-table-column prop="roleSort" label="级别" width="60" />
+        <el-table-column prop="dataScope" label="数据范围" width="100" />
+        <el-table-column prop="remark" label="说明" />
+      </el-table>
+    </el-dialog>
+
+    <el-dialog v-model="permVisible" title="角色权限矩阵" width="600px">
+      <el-table :data="permData" border>
+        <el-table-column prop="module" label="模块" width="120" />
+        <el-table-column prop="permissions" label="权限">
+          <template #default="{ row }">
+            <el-tag v-for="p in row.permissions" :key="p" style="margin: 2px" size="small">{{ p }}</el-tag>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, onMounted } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { getRoleList, createRole, updateRole, deleteRole, getRolePresets, getRolePermissions } from '@/api/system'
+
+const scopeTypeMap: Record<string, string> = { ALL: 'danger', DEPT: 'warning', CUSTOM: '', SELF: 'info' }
+const scopeLabelMap: Record<string, string> = { ALL: '全部', DEPT: '部门', CUSTOM: '自定义', SELF: '本人' }
+
+const tableData = ref<any[]>([])
+const pagination = reactive({ page: 1, size: 10, total: 0 })
+const dialogVisible = ref(false)
+const isEdit = ref(false)
+const editId = ref<number>(0)
+
+const defaultForm = { roleName: '', roleKey: '', roleSort: 0, dataScope: 'SELF', status: 1, remark: '' }
+const form = reactive({ ...defaultForm })
+
+const presetVisible = ref(false)
+const presets = ref<any[]>([])
+const permVisible = ref(false)
+const permData = ref<any[]>([])
+
+function loadData() {
+  getRoleList(pagination.page, pagination.size).then((res: any) => {
+    tableData.value = res.data.records
+    pagination.total = res.data.total
+  })
+}
+
+function openDialog(row?: any) {
+  if (row) {
+    isEdit.value = true
+    editId.value = row.id
+    Object.assign(form, row)
+  } else {
+    isEdit.value = false
+    editId.value = 0
+    Object.assign(form, defaultForm)
+  }
+  dialogVisible.value = true
+}
+
+function handleSubmit() {
+  if (!form.roleName || !form.roleKey) { ElMessage.warning('请填写完整信息'); return }
+  const action = isEdit.value
+    ? updateRole(editId.value, form)
+    : createRole(form)
+  action.then(() => {
+    ElMessage.success(isEdit.value ? '更新成功' : '创建成功')
+    dialogVisible.value = false
+    loadData()
+  })
+}
+
+function handleDelete(id: number) {
+  ElMessageBox.confirm('确认删除该角色?', '提示', { type: 'warning' }).then(() => {
+    deleteRole(id).then(() => {
+      ElMessage.success('删除成功')
+      loadData()
+    })
+  })
+}
+
+function loadPresets() {
+  getRolePresets().then((res: any) => {
+    presets.value = res.data
+    presetVisible.value = true
+  })
+}
+
+function viewPermissions(roleKey: string) {
+  getRolePermissions(roleKey).then((res: any) => {
+    const data = res.data || {}
+    permData.value = Object.entries(data).map(([module, perms]) => ({
+      module,
+      permissions: perms as string[]
+    }))
+    permVisible.value = true
+  })
+}
+
+onMounted(loadData)
+</script>
+
+<style scoped>
+.page-container { padding: 16px; }
+.card-header { display: flex; justify-content: space-between; align-items: center; }
+</style>

frontend/src/views/system/role/角色List.vue

@@ -1,22 +0,0 @@
-<template>
-  <div>
-    <el-button type="primary" @click="dialogVisible=true">新增角色</el-button>
-    <el-table :data="tableData" style="margin-top:10px" border>
-      <el-table-column prop="id" label="ID" width="80" />
-      <el-table-column prop="name" label="名称" />
-      <el-table-column label="操作" width="180">
-        <template #default>
-          <el-button link type="primary">编辑</el-button>
-          <el-button link type="danger">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-dialog v-model="dialogVisible" title="新增角色"><span>表单内容待实现</span></el-dialog>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref } from 'vue'
-const dialogVisible = ref(false)
-const tableData = ref<Array<{id:number,name:string}>>([])
-</script>

frontend/src/views/system/user/UserList.vue

@@ -0,0 +1,176 @@
+<template>
+  <div class="page-container">
+    <el-card shadow="never">
+      <template #header>
+        <div class="card-header">
+          <span>用户管理</span>
+          <el-button type="primary" @click="openDialog()">新增用户</el-button>
+        </div>
+      </template>
+
+      <el-form :inline="true" @submit.prevent="loadData">
+        <el-form-item label="用户名">
+          <el-input v-model="searchForm.username" placeholder="请输入用户名" clearable />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="loadData">搜索</el-button>
+          <el-button @click="resetSearch">重置</el-button>
+        </el-form-item>
+      </el-form>
+
+      <el-table :data="tableData" border stripe style="width: 100%; margin-top: 10px">
+        <el-table-column prop="id" label="ID" width="70" />
+        <el-table-column prop="username" label="用户名" width="120" />
+        <el-table-column prop="realName" label="姓名" width="100" />
+        <el-table-column prop="nickname" label="昵称" width="100" />
+        <el-table-column prop="phone" label="手机号" width="130" />
+        <el-table-column prop="email" label="邮箱" />
+        <el-table-column prop="roleType" label="角色类型" width="100">
+          <template #default="{ row }">
+            <el-tag>{{ roleTypeMap[row.roleType] || row.roleType }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="status" label="状态" width="80">
+          <template #default="{ row }">
+            <el-switch :model-value="row.status === 1"
+              @change="(val: boolean) => handleToggleStatus(row.id, val ? 1 : 0)" />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="150" fixed="right">
+          <template #default="{ row }">
+            <el-button link type="primary" @click="openDialog(row)">编辑</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-pagination
+        v-model:current-page="pagination.page"
+        v-model:page-size="pagination.size"
+        :total="pagination.total"
+        :page-sizes="[10, 20, 50]"
+        layout="total, sizes, prev, pager, next"
+        style="margin-top: 15px; justify-content: flex-end"
+        @size-change="loadData"
+        @current-change="loadData"
+      />
+    </el-card>
+
+    <el-dialog v-model="dialogVisible" :title="isEdit ? '编辑用户' : '新增用户'" width="600px">
+      <el-form :model="form" label-width="80px">
+        <el-form-item label="用户名" required>
+          <el-input v-model="form.username" :disabled="isEdit" />
+        </el-form-item>
+        <el-form-item label="密码" v-if="!isEdit" required>
+          <el-input v-model="form.password" type="password" show-password />
+        </el-form-item>
+        <el-form-item label="姓名">
+          <el-input v-model="form.realName" />
+        </el-form-item>
+        <el-form-item label="昵称">
+          <el-input v-model="form.nickname" />
+        </el-form-item>
+        <el-form-item label="手机号">
+          <el-input v-model="form.phone" />
+        </el-form-item>
+        <el-form-item label="邮箱">
+          <el-input v-model="form.email" />
+        </el-form-item>
+        <el-form-item label="性别">
+          <el-radio-group v-model="form.gender">
+            <el-radio :value="0">未知</el-radio>
+            <el-radio :value="1">男</el-radio>
+            <el-radio :value="2">女</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="角色类型">
+          <el-select v-model="form.roleType">
+            <el-option label="管理员" value="admin" />
+            <el-option label="分管领导" value="leader" />
+            <el-option label="业务管理" value="manager" />
+            <el-option label="运维人员" value="operator" />
+            <el-option label="技术维护" value="tech" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-switch v-model="form.status" :active-value="1" :inactive-value="0" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button @click="dialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="handleSubmit">确定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, onMounted } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getUserList, createUser, updateUser, toggleUserStatus } from '@/api/system'
+
+const roleTypeMap: Record<string, string> = {
+  admin: '管理员', leader: '分管领导', manager: '业务管理', operator: '运维', tech: '技术'
+}
+
+const searchForm = reactive({ username: '' })
+const tableData = ref<any[]>([])
+const pagination = reactive({ page: 1, size: 10, total: 0 })
+const dialogVisible = ref(false)
+const isEdit = ref(false)
+const editId = ref<number>(0)
+
+const defaultForm = { username: '', password: '', realName: '', nickname: '', phone: '', email: '', gender: 0, roleType: 'operator', status: 1 }
+const form = reactive({ ...defaultForm })
+
+function loadData() {
+  getUserList(pagination.page, pagination.size, searchForm.username || undefined).then((res: any) => {
+    tableData.value = res.data.records
+    pagination.total = res.data.total
+  })
+}
+
+function resetSearch() {
+  searchForm.username = ''
+  pagination.page = 1
+  loadData()
+}
+
+function openDialog(row?: any) {
+  if (row) {
+    isEdit.value = true
+    editId.value = row.id
+    Object.assign(form, row)
+  } else {
+    isEdit.value = false
+    editId.value = 0
+    Object.assign(form, defaultForm)
+  }
+  dialogVisible.value = true
+}
+
+function handleSubmit() {
+  if (!form.username) { ElMessage.warning('请输入用户名'); return }
+  const action = isEdit.value
+    ? updateUser(editId.value, form)
+    : createUser(form)
+  action.then(() => {
+    ElMessage.success(isEdit.value ? '更新成功' : '创建成功')
+    dialogVisible.value = false
+    loadData()
+  })
+}
+
+function handleToggleStatus(id: number, status: number) {
+  toggleUserStatus(id, status).then(() => {
+    ElMessage.success(status === 1 ? '已启用' : '已停用')
+    loadData()
+  })
+}
+
+onMounted(loadData)
+</script>
+
+<style scoped>
+.page-container { padding: 16px; }
+.card-header { display: flex; justify-content: space-between; align-items: center; }
+</style>

frontend/src/views/system/user/用户List.vue

@@ -1,22 +0,0 @@
-<template>
-  <div>
-    <el-button type="primary" @click="dialogVisible=true">新增用户</el-button>
-    <el-table :data="tableData" style="margin-top:10px" border>
-      <el-table-column prop="id" label="ID" width="80" />
-      <el-table-column prop="name" label="名称" />
-      <el-table-column label="操作" width="180">
-        <template #default>
-          <el-button link type="primary">编辑</el-button>
-          <el-button link type="danger">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-dialog v-model="dialogVisible" title="新增用户"><span>表单内容待实现</span></el-dialog>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref } from 'vue'
-const dialogVisible = ref(false)
-const tableData = ref<Array<{id:number,name:string}>>([])
-</script>

wm-base/src/main/java/com/water/base/controller/SysDictionaryController.java

@@ -0,0 +1,102 @@
+package com.water.base.controller;
+
+import com.water.base.entity.SysDictData;
+import com.water.base.entity.SysDictType;
+import com.water.base.service.SysDictionaryService;
+import com.water.common.core.result.R;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Tag(name = "数据字典管理")
+@RestController
+@RequestMapping("/sys/dict")
+@RequiredArgsConstructor
+public class SysDictionaryController {
+
+    private final SysDictionaryService dictionaryService;
+
+    // ============ 字典类型 ============
+
+    @Operation(summary = "字典类型列表")
+    @GetMapping("/type/list")
+    public R<List<SysDictType>> listTypes(@RequestParam(required = false) String dictName) {
+        return R.ok(dictionaryService.listTypes(dictName));
+    }
+
+    @Operation(summary = "字典类型详情")
+    @GetMapping("/type/{id}")
+    public R<SysDictType> getType(@PathVariable Long id) {
+        return R.ok(dictionaryService.getTypeById(id));
+    }
+
+    @Operation(summary = "新增字典类型")
+    @PostMapping("/type")
+    public R<String> createType(@RequestBody SysDictType type) {
+        dictionaryService.createType(type);
+        return R.ok("创建成功");
+    }
+
+    @Operation(summary = "编辑字典类型")
+    @PutMapping("/type/{id}")
+    public R<String> updateType(@PathVariable Long id, @RequestBody SysDictType type) {
+        type.setId(id);
+        dictionaryService.updateType(type);
+        return R.ok("更新成功");
+    }
+
+    @Operation(summary = "删除字典类型")
+    @DeleteMapping("/type/{id}")
+    public R<String> deleteType(@PathVariable Long id) {
+        dictionaryService.deleteType(id);
+        return R.ok("删除成功");
+    }
+
+    // ============ 字典数据 ============
+
+    @Operation(summary = "字典数据列表（按类型ID）")
+    @GetMapping("/data/list")
+    public R<List<SysDictData>> listData(@RequestParam Long typeId) {
+        return R.ok(dictionaryService.listDataByTypeId(typeId));
+    }
+
+    @Operation(summary = "字典数据列表（按字典key）")
+    @GetMapping("/data/key/{dictKey}")
+    public R<List<SysDictData>> listDataByKey(@PathVariable String dictKey) {
+        return R.ok(dictionaryService.listDataByKey(dictKey));
+    }
+
+    @Operation(summary = "新增字典数据")
+    @PostMapping("/data")
+    public R<String> createData(@RequestBody SysDictData data) {
+        dictionaryService.createData(data);
+        return R.ok("创建成功");
+    }
+
+    @Operation(summary = "编辑字典数据")
+    @PutMapping("/data/{id}")
+    public R<String> updateData(@PathVariable Long id, @RequestBody SysDictData data) {
+        data.setId(id);
+        dictionaryService.updateData(data);
+        return R.ok("更新成功");
+    }
+
+    @Operation(summary = "删除字典数据")
+    @DeleteMapping("/data/{id}")
+    public R<String> deleteData(@PathVariable Long id) {
+        dictionaryService.deleteData(id);
+        return R.ok("删除成功");
+    }
+
+    // ============ 缓存 ============
+
+    @Operation(summary = "清空字典缓存")
+    @PostMapping("/cache/clear")
+    public R<String> clearCache() {
+        dictionaryService.clearCache();
+        return R.ok("缓存已清空");
+    }
+}

wm-base/src/main/java/com/water/base/controller/SysOperationLogController.java

@@ -0,0 +1,98 @@
+package com.water.base.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.water.base.entity.SysOperationLog;
+import com.water.base.service.SysOperationLogService;
+import com.water.common.core.result.R;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Tag(name = "操作日志管理")
+@RestController
+@RequestMapping("/sys/log")
+@RequiredArgsConstructor
+public class SysOperationLogController {
+
+    private final SysOperationLogService logService;
+
+    @Operation(summary = "分页查询操作日志")
+    @GetMapping("/list")
+    public R<Page<SysOperationLog>> list(
+            @RequestParam(defaultValue = "1") int page,
+            @RequestParam(defaultValue = "10") int size,
+            @RequestParam(required = false) String username,
+            @RequestParam(required = false) String module,
+            @RequestParam(required = false) String operation,
+            @RequestParam(required = false) Integer status,
+            @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime startTime,
+            @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime) {
+        return R.ok(logService.queryPage(page, size, username, module, operation, status, startTime, endTime));
+    }
+
+    @Operation(summary = "日志详情")
+    @GetMapping("/{id}")
+    public R<SysOperationLog> getById(@PathVariable Long id) {
+        return R.ok(logService.getById(id));
+    }
+
+    @Operation(summary = "导出操作日志（CSV）")
+    @GetMapping("/export")
+    public void export(
+            @RequestParam(required = false) String username,
+            @RequestParam(required = false) String module,
+            @RequestParam(required = false) String operation,
+            @RequestParam(required = false) Integer status,
+            @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime startTime,
+            @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime,
+            HttpServletResponse response) throws IOException {
+        List<SysOperationLog> logs = logService.queryForExport(username, module, operation, status, startTime, endTime);
+
+        response.setContentType("text/csv; charset=UTF-8");
+        response.setHeader("Content-Disposition", "attachment; filename=operation_log.csv");
+        response.setCharacterEncoding("UTF-8");
+
+        try (Writer writer = new OutputStreamWriter(response.getOutputStream(), StandardCharsets.UTF_8)) {
+            // BOM for Excel UTF-8
+            writer.write('\uFEFF');
+            writer.write("ID,用户,模块,操作,请求方式,请求URL,耗时(ms),状态,时间\n");
+            for (SysOperationLog log : logs) {
+                writer.write(String.format("%d,%s,%s,%s,%s,%s,%d,%s,%s\n",
+                        log.getId(),
+                        csvEscape(log.getUsername()),
+                        csvEscape(log.getModule()),
+                        csvEscape(log.getOperation()),
+                        csvEscape(log.getRequestMethod()),
+                        csvEscape(log.getRequestUrl()),
+                        log.getDuration() != null ? log.getDuration() : 0,
+                        log.getStatus() != null && log.getStatus() == 1 ? "成功" : "失败",
+                        log.getCreatedAt()));
+            }
+        }
+    }
+
+    @Operation(summary = "清空操作日志")
+    @DeleteMapping("/clean")
+    public R<String> clean() {
+        logService.cleanAll();
+        return R.ok("日志已清空");
+    }
+
+    private String csvEscape(String s) {
+        if (s == null) return "";
+        if (s.contains(",") || s.contains("\"") || s.contains("\n")) {
+            return "\"" + s.replace("\"", "\"\"") + "\"";
+        }
+        return s;
+    }
+}

wm-base/src/main/java/com/water/base/controller/SysRoleController.java

@@ -9,6 +9,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+import java.util.Map;
+
 @Tag(name = "角色管理")
 @RestController
 @RequestMapping("/sys/role")
@@ -51,4 +54,23 @@ public class SysRoleController {
         sysRoleService.removeById(id);
         return R.ok("删除成功");
     }
+
+    @Operation(summary = "获取5级角色预设列表")
+    @GetMapping("/presets")
+    public R<List<SysRoleService.RolePreset>> presets() {
+        return R.ok(sysRoleService.getPresets());
+    }
+
+    @Operation(summary = "获取角色权限矩阵")
+    @GetMapping("/permissions/{roleKey}")
+    public R<Map<String, List<String>>> permissions(@PathVariable String roleKey) {
+        return R.ok(sysRoleService.getRolePermissions(roleKey));
+    }
+
+    @Operation(summary = "初始化预设角色")
+    @PostMapping("/init-presets")
+    public R<String> initPresets() {
+        sysRoleService.initPresets();
+        return R.ok("预设角色初始化完成");
+    }
 }

wm-base/src/main/java/com/water/base/entity/SysDictData.java

@@ -0,0 +1,22 @@
+package com.water.base.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.time.LocalDateTime;
+
+@Data
+@TableName("sys_dict_data")
+public class SysDictData {
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    private Long dictTypeId;
+    private String dictLabel;
+    private String dictValue;
+    private String cssClass;
+    private String listClass;
+    private Integer sortOrder;
+    private Integer status;
+    private String remark;
+    private LocalDateTime createdAt;
+    private LocalDateTime updatedAt;
+}

wm-base/src/main/java/com/water/base/entity/SysDictType.java

@@ -0,0 +1,18 @@
+package com.water.base.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.time.LocalDateTime;
+
+@Data
+@TableName("sys_dict_type")
+public class SysDictType {
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    private String dictName;
+    private String dictKey;
+    private Integer status;
+    private String remark;
+    private LocalDateTime createdAt;
+    private LocalDateTime updatedAt;
+}

wm-base/src/main/java/com/water/base/entity/SysOperationLog.java

@@ -0,0 +1,27 @@
+package com.water.base.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.time.LocalDateTime;
+
+@Data
+@TableName("sys_oper_log")
+public class SysOperationLog {
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    private Long userId;
+    private String username;
+    private String module;
+    private String operation;
+    private String method;
+    private String requestMethod;
+    private String requestUrl;
+    private String requestParams;
+    private String responseResult;
+    private String ip;
+    private String location;
+    private Long duration;
+    private Integer status;
+    private String errorMsg;
+    private LocalDateTime createdAt;
+}

wm-base/src/main/java/com/water/base/mapper/SysDictDataMapper.java

@@ -0,0 +1,8 @@
+package com.water.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.water.base.entity.SysDictData;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SysDictDataMapper extends BaseMapper<SysDictData> {}

wm-base/src/main/java/com/water/base/mapper/SysDictTypeMapper.java

@@ -0,0 +1,8 @@
+package com.water.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.water.base.entity.SysDictType;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SysDictTypeMapper extends BaseMapper<SysDictType> {}

wm-base/src/main/java/com/water/base/mapper/SysOperationLogMapper.java

@@ -0,0 +1,8 @@
+package com.water.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.water.base.entity.SysOperationLog;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SysOperationLogMapper extends BaseMapper<SysOperationLog> {}

wm-base/src/main/java/com/water/base/service/SysDictionaryService.java

@@ -0,0 +1,122 @@
+package com.water.base.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.water.base.entity.SysDictData;
+import com.water.base.entity.SysDictType;
+import com.water.base.mapper.SysDictDataMapper;
+import com.water.base.mapper.SysDictTypeMapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+@Service
+@RequiredArgsConstructor
+public class SysDictionaryService extends ServiceImpl<SysDictTypeMapper, SysDictType> {
+
+    private final SysDictDataMapper dictDataMapper;
+
+    /** 本地缓存: dictKey -> List<SysDictData> */
+    private final Map<String, List<SysDictData>> cache = new ConcurrentHashMap<>();
+
+    // ============ 字典类型 CRUD ============
+
+    public List<SysDictType> listTypes(String dictName) {
+        LambdaQueryWrapper<SysDictType> qw = new LambdaQueryWrapper<>();
+        if (dictName != null && !dictName.isEmpty()) {
+            qw.like(SysDictType::getDictName, dictName);
+        }
+        qw.orderByAsc(SysDictType::getId);
+        return this.list(qw);
+    }
+
+    public SysDictType getTypeById(Long id) {
+        return this.getById(id);
+    }
+
+    public void createType(SysDictType type) {
+        this.save(type);
+        evictCache(type.getDictKey());
+    }
+
+    public void updateType(SysDictType type) {
+        this.updateById(type);
+        evictCache(type.getDictKey());
+    }
+
+    public void deleteType(Long id) {
+        SysDictType type = this.getById(id);
+        if (type != null) {
+            // 同时删除关联的字典数据
+            dictDataMapper.delete(new LambdaQueryWrapper<SysDictData>()
+                    .eq(SysDictData::getDictTypeId, id));
+            this.removeById(id);
+            evictCache(type.getDictKey());
+        }
+    }
+
+    // ============ 字典数据 CRUD ============
+
+    public List<SysDictData> listDataByTypeId(Long typeId) {
+        return dictDataMapper.selectList(new LambdaQueryWrapper<SysDictData>()
+                .eq(SysDictData::getDictTypeId, typeId)
+                .orderByAsc(SysDictData::getSortOrder));
+    }
+
+    public List<SysDictData> listDataByKey(String dictKey) {
+        // 先查缓存
+        List<SysDictData> cached = cache.get(dictKey);
+        if (cached != null) {
+            return cached;
+        }
+        // 缓存未命中，查库
+        SysDictType type = this.getOne(new LambdaQueryWrapper<SysDictType>()
+                .eq(SysDictType::getDictKey, dictKey));
+        if (type == null) {
+            return Collections.emptyList();
+        }
+        List<SysDictData> data = listDataByTypeId(type.getId());
+        cache.put(dictKey, data);
+        return data;
+    }
+
+    public void createData(SysDictData data) {
+        dictDataMapper.insert(data);
+        evictByTypeId(data.getDictTypeId());
+    }
+
+    public void updateData(SysDictData data) {
+        dictDataMapper.updateById(data);
+        evictByTypeId(data.getDictTypeId());
+    }
+
+    public void deleteData(Long id) {
+        SysDictData data = dictDataMapper.selectById(id);
+        if (data != null) {
+            dictDataMapper.deleteById(id);
+            evictByTypeId(data.getDictTypeId());
+        }
+    }
+
+    // ============ 缓存管理 ============
+
+    public void clearCache() {
+        cache.clear();
+    }
+
+    private void evictCache(String dictKey) {
+        if (dictKey != null) {
+            cache.remove(dictKey);
+        }
+    }
+
+    private void evictByTypeId(Long typeId) {
+        SysDictType type = this.getById(typeId);
+        if (type != null) {
+            evictCache(type.getDictKey());
+        }
+    }
+}

wm-base/src/main/java/com/water/base/service/SysOperationLogService.java

@@ -0,0 +1,114 @@
+package com.water.base.service;
+
+import cn.dev33.satoken.stp.StpUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.water.base.entity.SysOperationLog;
+import com.water.base.mapper.SysOperationLogMapper;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Service
+public class SysOperationLogService extends ServiceImpl<SysOperationLogMapper, SysOperationLog> {
+
+    /**
+     * 记录操作日志
+     */
+    public void record(String module, String operation, String method,
+                       String requestMethod, String requestUrl, String requestParams,
+                       String responseResult, Long duration, Integer status, String errorMsg) {
+        SysOperationLog log = new SysOperationLog();
+        try {
+            log.setUserId(StpUtil.getLoginIdAsLong());
+            log.setUsername((String) StpUtil.getSession().get("realName"));
+        } catch (Exception ignored) {
+            // 未登录场景
+        }
+        log.setModule(module);
+        log.setOperation(operation);
+        log.setMethod(method);
+        log.setRequestMethod(requestMethod);
+        log.setRequestUrl(requestUrl);
+        log.setRequestParams(truncate(requestParams, 2000));
+        log.setResponseResult(truncate(responseResult, 2000));
+        log.setDuration(duration);
+        log.setStatus(status);
+        log.setErrorMsg(truncate(errorMsg, 2000));
+        this.save(log);
+    }
+
+    /**
+     * 分页查询操作日志
+     */
+    public Page<SysOperationLog> queryPage(int page, int size,
+                                            String username, String module,
+                                            String operation, Integer status,
+                                            LocalDateTime startTime, LocalDateTime endTime) {
+        LambdaQueryWrapper<SysOperationLog> qw = new LambdaQueryWrapper<>();
+        if (username != null && !username.isEmpty()) {
+            qw.like(SysOperationLog::getUsername, username);
+        }
+        if (module != null && !module.isEmpty()) {
+            qw.eq(SysOperationLog::getModule, module);
+        }
+        if (operation != null && !operation.isEmpty()) {
+            qw.like(SysOperationLog::getOperation, operation);
+        }
+        if (status != null) {
+            qw.eq(SysOperationLog::getStatus, status);
+        }
+        if (startTime != null) {
+            qw.ge(SysOperationLog::getCreatedAt, startTime);
+        }
+        if (endTime != null) {
+            qw.le(SysOperationLog::getCreatedAt, endTime);
+        }
+        qw.orderByDesc(SysOperationLog::getCreatedAt);
+        return this.page(new Page<>(page, size), qw);
+    }
+
+    /**
+     * 查询导出列表（限制最大条数）
+     */
+    public List<SysOperationLog> queryForExport(String username, String module,
+                                                 String operation, Integer status,
+                                                 LocalDateTime startTime, LocalDateTime endTime) {
+        LambdaQueryWrapper<SysOperationLog> qw = new LambdaQueryWrapper<>();
+        if (username != null && !username.isEmpty()) {
+            qw.like(SysOperationLog::getUsername, username);
+        }
+        if (module != null && !module.isEmpty()) {
+            qw.eq(SysOperationLog::getModule, module);
+        }
+        if (operation != null && !operation.isEmpty()) {
+            qw.like(SysOperationLog::getOperation, operation);
+        }
+        if (status != null) {
+            qw.eq(SysOperationLog::getStatus, status);
+        }
+        if (startTime != null) {
+            qw.ge(SysOperationLog::getCreatedAt, startTime);
+        }
+        if (endTime != null) {
+            qw.le(SysOperationLog::getCreatedAt, endTime);
+        }
+        qw.orderByDesc(SysOperationLog::getCreatedAt);
+        qw.last("LIMIT 10000");
+        return this.list(qw);
+    }
+
+    /**
+     * 清空日志（管理员操作）
+     */
+    public void cleanAll() {
+        this.remove(new LambdaQueryWrapper<>());
+    }
+
+    private String truncate(String s, int maxLen) {
+        if (s == null) return null;
+        return s.length() > maxLen ? s.substring(0, maxLen) : s;
+    }
+}

wm-base/src/main/java/com/water/base/service/SysRoleService.java

@@ -1,9 +1,112 @@
 package com.water.base.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.water.base.entity.SysRole;
 import com.water.base.mapper.SysRoleMapper;
 import org.springframework.stereotype.Service;
 
+import java.util.*;
+
 @Service
-public class SysRoleService extends ServiceImpl<SysRoleMapper, SysRole> {}
+public class SysRoleService extends ServiceImpl<SysRoleMapper, SysRole> {
+
+    /**
+     * 5级角色预设定义
+     * 管理员(admin) / 分管领导(supervisor) / 业务管理(biz_manager) / 运维(field_ops) / 技术(tech_maintain)
+     */
+    public static final List<RolePreset> ROLE_PRESETS = List.of(
+            new RolePreset("系统管理员", "admin", 1, "ALL",
+                    "拥有系统全部权限，可管理所有模块和用户"),
+            new RolePreset("分管领导", "supervisor", 2, "ALL",
+                    "可查看所有数据，审批流程，管理分管范围内的业务"),
+            new RolePreset("业务管理员", "biz_manager", 3, "DEPT",
+                    "管理本部门业务数据，包括数据录入、审核、报表等"),
+            new RolePreset("运维人员", "field_ops", 4, "DEPT",
+                    "负责设备巡检、告警处理、工单执行等现场运维工作"),
+            new RolePreset("技术维护", "tech_maintain", 5, "SELF",
+                    "系统技术维护，负责配置管理、日志查看、故障排查")
+    );
+
+    /**
+     * 权限矩阵：角色对应的模块权限
+     * key: roleKey, value: Map<module, permissions>
+     */
+    public static final Map<String, Map<String, List<String>>> PERMISSION_MATRIX = Map.of(
+            "admin", Map.of(
+                    "system", List.of("read", "write", "delete", "export"),
+                    "monitor", List.of("read", "write", "delete", "export"),
+                    "production", List.of("read", "write", "delete", "export"),
+                    "dispatch", List.of("read", "write", "delete", "export", "approve"),
+                    "revenue", List.of("read", "write", "delete", "export")
+            ),
+            "supervisor", Map.of(
+                    "system", List.of("read"),
+                    "monitor", List.of("read", "export"),
+                    "production", List.of("read", "write", "export", "approve"),
+                    "dispatch", List.of("read", "write", "export", "approve"),
+                    "revenue", List.of("read", "export")
+            ),
+            "biz_manager", Map.of(
+                    "system", List.of("read"),
+                    "monitor", List.of("read"),
+                    "production", List.of("read", "write", "export"),
+                    "dispatch", List.of("read", "write"),
+                    "revenue", List.of("read", "write")
+            ),
+            "field_ops", Map.of(
+                    "monitor", List.of("read"),
+                    "production", List.of("read"),
+                    "dispatch", List.of("read", "write")
+            ),
+            "tech_maintain", Map.of(
+                    "system", List.of("read", "write"),
+                    "monitor", List.of("read")
+            )
+    );
+
+    /**
+     * 初始化预设角色（幂等操作）
+     */
+    public void initPresets() {
+        for (RolePreset preset : ROLE_PRESETS) {
+            SysRole existing = this.getOne(new LambdaQueryWrapper<SysRole>()
+                    .eq(SysRole::getRoleKey, preset.roleKey()));
+            if (existing == null) {
+                SysRole role = new SysRole();
+                role.setRoleName(preset.roleName());
+                role.setRoleKey(preset.roleKey());
+                role.setRoleSort(preset.roleSort());
+                role.setDataScope(preset.dataScope());
+                role.setRemark(preset.remark());
+                role.setStatus(1);
+                this.save(role);
+            }
+        }
+    }
+
+    /**
+     * 获取角色权限矩阵
+     */
+    public Map<String, List<String>> getRolePermissions(String roleKey) {
+        return PERMISSION_MATRIX.getOrDefault(roleKey, Collections.emptyMap());
+    }
+
+    /**
+     * 获取所有预设角色信息
+     */
+    public List<RolePreset> getPresets() {
+        return ROLE_PRESETS;
+    }
+
+    /**
+     * 角色预设记录
+     */
+    public record RolePreset(
+            String roleName,
+            String roleKey,
+            int roleSort,
+            String dataScope,
+            String remark
+    ) {}
+}

wm-base/src/main/resources/db/V_sys_dict_log.sql

@@ -0,0 +1,175 @@
+-- =============================================
+-- 系统管理扩展 - 数据字典 & 操作日志
+-- 版本: V_sys_dict_log
+-- 描述: 补充数据字典和操作日志相关表（如V1__base已包含则跳过）
+-- =============================================
+
+-- 字典类型表（如不存在则创建）
+CREATE TABLE IF NOT EXISTS sys_dict_type (
+    id BIGSERIAL PRIMARY KEY,
+    dict_name VARCHAR(100) NOT NULL,
+    dict_key VARCHAR(100) UNIQUE NOT NULL,
+    status SMALLINT DEFAULT 1,
+    remark VARCHAR(500),
+    created_at TIMESTAMP DEFAULT NOW(),
+    updated_at TIMESTAMP DEFAULT NOW()
+);
+COMMENT ON TABLE sys_dict_type IS '字典类型表';
+
+-- 字典数据表（如不存在则创建）
+CREATE TABLE IF NOT EXISTS sys_dict_data (
+    id BIGSERIAL PRIMARY KEY,
+    dict_type_id BIGINT REFERENCES sys_dict_type(id),
+    dict_label VARCHAR(100) NOT NULL,
+    dict_value VARCHAR(100) NOT NULL,
+    css_class VARCHAR(100),
+    list_class VARCHAR(100),
+    sort_order INT DEFAULT 0,
+    status SMALLINT DEFAULT 1,
+    remark VARCHAR(500),
+    created_at TIMESTAMP DEFAULT NOW(),
+    updated_at TIMESTAMP DEFAULT NOW()
+);
+COMMENT ON TABLE sys_dict_data IS '字典数据表';
+
+-- 操作日志表（如不存在则创建）
+CREATE TABLE IF NOT EXISTS sys_oper_log (
+    id BIGSERIAL PRIMARY KEY,
+    user_id BIGINT,
+    username VARCHAR(50),
+    module VARCHAR(50),
+    operation VARCHAR(50),
+    method VARCHAR(200),
+    request_method VARCHAR(10),
+    request_url VARCHAR(500),
+    request_params TEXT,
+    response_result TEXT,
+    ip VARCHAR(50),
+    location VARCHAR(100),
+    duration BIGINT,
+    status SMALLINT DEFAULT 1,
+    error_msg TEXT,
+    created_at TIMESTAMP DEFAULT NOW()
+);
+COMMENT ON TABLE sys_oper_log IS '操作日志表';
+
+-- 索引
+CREATE INDEX IF NOT EXISTS idx_dict_data_type ON sys_dict_data(dict_type_id);
+CREATE INDEX IF NOT EXISTS idx_oper_log_created ON sys_oper_log(created_at);
+CREATE INDEX IF NOT EXISTS idx_oper_log_username ON sys_oper_log(username);
+CREATE INDEX IF NOT EXISTS idx_oper_log_module ON sys_oper_log(module);
+
+-- 预设5级角色（幂等）
+INSERT INTO sys_role (role_name, role_key, role_sort, data_scope, status, remark)
+SELECT '系统管理员', 'admin', 1, 'ALL', 1, '拥有系统全部权限，可管理所有模块和用户'
+WHERE NOT EXISTS (SELECT 1 FROM sys_role WHERE role_key = 'admin');
+
+INSERT INTO sys_role (role_name, role_key, role_sort, data_scope, status, remark)
+SELECT '分管领导', 'supervisor', 2, 'ALL', 1, '可查看所有数据，审批流程，管理分管范围内的业务'
+WHERE NOT EXISTS (SELECT 1 FROM sys_role WHERE role_key = 'supervisor');
+
+INSERT INTO sys_role (role_name, role_key, role_sort, data_scope, status, remark)
+SELECT '业务管理员', 'biz_manager', 3, 'DEPT', 1, '管理本部门业务数据，包括数据录入、审核、报表等'
+WHERE NOT EXISTS (SELECT 1 FROM sys_role WHERE role_key = 'biz_manager');
+
+INSERT INTO sys_role (role_name, role_key, role_sort, data_scope, status, remark)
+SELECT '运维人员', 'field_ops', 4, 'DEPT', 1, '负责设备巡检、告警处理、工单执行等现场运维工作'
+WHERE NOT EXISTS (SELECT 1 FROM sys_role WHERE role_key = 'field_ops');
+
+INSERT INTO sys_role (role_name, role_key, role_sort, data_scope, status, remark)
+SELECT '技术维护', 'tech_maintain', 5, 'SELF', 1, '系统技术维护，负责配置管理、日志查看、故障排查'
+WHERE NOT EXISTS (SELECT 1 FROM sys_role WHERE role_key = 'tech_maintain');
+
+-- 预设字典数据
+INSERT INTO sys_dict_type (dict_name, dict_key, status, remark)
+SELECT '用户性别', 'sys_user_gender', 1, '用户性别字典'
+WHERE NOT EXISTS (SELECT 1 FROM sys_dict_type WHERE dict_key = 'sys_user_gender');
+
+INSERT INTO sys_dict_type (dict_name, dict_key, status, remark)
+SELECT '通用状态', 'sys_common_status', 1, '通用状态字典'
+WHERE NOT EXISTS (SELECT 1 FROM sys_dict_type WHERE dict_key = 'sys_common_status');
+
+INSERT INTO sys_dict_type (dict_name, dict_key, status, remark)
+SELECT '部门类型', 'sys_dept_type', 1, '部门类型字典'
+WHERE NOT EXISTS (SELECT 1 FROM sys_dict_type WHERE dict_key = 'sys_dept_type');
+
+INSERT INTO sys_dict_type (dict_name, dict_key, status, remark)
+SELECT '角色类型', 'sys_role_type', 1, '角色类型字典'
+WHERE NOT EXISTS (SELECT 1 FROM sys_dict_type WHERE dict_key = 'sys_role_type');
+
+INSERT INTO sys_dict_type (dict_name, dict_key, status, remark)
+SELECT '数据权限范围', 'sys_data_scope', 1, '数据权限范围字典'
+WHERE NOT EXISTS (SELECT 1 FROM sys_dict_type WHERE dict_key = 'sys_data_scope');
+
+-- 性别字典数据
+INSERT INTO sys_dict_data (dict_type_id, dict_label, dict_value, sort_order, status)
+SELECT id, '未知', '0', 0, 1 FROM sys_dict_type WHERE dict_key = 'sys_user_gender'
+AND NOT EXISTS (SELECT 1 FROM sys_dict_data WHERE dict_type_id = (SELECT id FROM sys_dict_type WHERE dict_key = 'sys_user_gender') AND dict_value = '0');
+
+INSERT INTO sys_dict_data (dict_type_id, dict_label, dict_value, sort_order, status)
+SELECT id, '男', '1', 1, 1 FROM sys_dict_type WHERE dict_key = 'sys_user_gender'
+AND NOT EXISTS (SELECT 1 FROM sys_dict_data WHERE dict_type_id = (SELECT id FROM sys_dict_type WHERE dict_key = 'sys_user_gender') AND dict_value = '1');
+
+INSERT INTO sys_dict_data (dict_type_id, dict_label, dict_value, sort_order, status)
+SELECT id, '女', '2', 2, 1 FROM sys_dict_type WHERE dict_key = 'sys_user_gender'
+AND NOT EXISTS (SELECT 1 FROM sys_dict_data WHERE dict_type_id = (SELECT id FROM sys_dict_type WHERE dict_key = 'sys_user_gender') AND dict_value = '2');
+
+-- 通用状态
+INSERT INTO sys_dict_data (dict_type_id, dict_label, dict_value, sort_order, status)
+SELECT id, '停用', '0', 0, 1 FROM sys_dict_type WHERE dict_key = 'sys_common_status'
+AND NOT EXISTS (SELECT 1 FROM sys_dict_data WHERE dict_type_id = (SELECT id FROM sys_dict_type WHERE dict_key = 'sys_common_status') AND dict_value = '0');
+
+INSERT INTO sys_dict_data (dict_type_id, dict_label, dict_value, sort_order, status)
+SELECT id, '启用', '1', 1, 1 FROM sys_dict_type WHERE dict_key = 'sys_common_status'
+AND NOT EXISTS (SELECT 1 FROM sys_dict_data WHERE dict_type_id = (SELECT id FROM sys_dict_type WHERE dict_key = 'sys_common_status') AND dict_value = '1');
+
+-- 部门类型
+INSERT INTO sys_dict_data (dict_type_id, dict_label, dict_value, sort_order, status)
+SELECT id, '水利局', 'water_bureau', 0, 1 FROM sys_dict_type WHERE dict_key = 'sys_dept_type'
+AND NOT EXISTS (SELECT 1 FROM sys_dict_data WHERE dict_type_id = (SELECT id FROM sys_dict_type WHERE dict_key = 'sys_dept_type') AND dict_value = 'water_bureau');
+
+INSERT INTO sys_dict_data (dict_type_id, dict_label, dict_value, sort_order, status)
+SELECT id, '水务公司', 'water_company', 1, 1 FROM sys_dict_type WHERE dict_key = 'sys_dept_type'
+AND NOT EXISTS (SELECT 1 FROM sys_dict_data WHERE dict_type_id = (SELECT id FROM sys_dict_type WHERE dict_key = 'sys_dept_type') AND dict_value = 'water_company');
+
+INSERT INTO sys_dict_data (dict_type_id, dict_label, dict_value, sort_order, status)
+SELECT id, '运维单位', 'ops', 2, 1 FROM sys_dict_type WHERE dict_key = 'sys_dept_type'
+AND NOT EXISTS (SELECT 1 FROM sys_dict_data WHERE dict_type_id = (SELECT id FROM sys_dict_type WHERE dict_key = 'sys_dept_type') AND dict_value = 'ops');
+
+-- 角色类型
+INSERT INTO sys_dict_data (dict_type_id, dict_label, dict_value, sort_order, status)
+SELECT id, '系统管理员', 'admin', 1, 1 FROM sys_dict_type WHERE dict_key = 'sys_role_type'
+AND NOT EXISTS (SELECT 1 FROM sys_dict_data WHERE dict_type_id = (SELECT id FROM sys_dict_type WHERE dict_key = 'sys_role_type') AND dict_value = 'admin');
+
+INSERT INTO sys_dict_data (dict_type_id, dict_label, dict_value, sort_order, status)
+SELECT id, '分管领导', 'supervisor', 2, 1 FROM sys_dict_type WHERE dict_key = 'sys_role_type'
+AND NOT EXISTS (SELECT 1 FROM sys_dict_data WHERE dict_type_id = (SELECT id FROM sys_dict_type WHERE dict_key = 'sys_role_type') AND dict_value = 'supervisor');
+
+INSERT INTO sys_dict_data (dict_type_id, dict_label, dict_value, sort_order, status)
+SELECT id, '业务管理员', 'biz_manager', 3, 1 FROM sys_dict_type WHERE dict_key = 'sys_role_type'
+AND NOT EXISTS (SELECT 1 FROM sys_dict_data WHERE dict_type_id = (SELECT id FROM sys_dict_type WHERE dict_key = 'sys_role_type') AND dict_value = 'biz_manager');
+
+INSERT INTO sys_dict_data (dict_type_id, dict_label, dict_value, sort_order, status)
+SELECT id, '运维人员', 'field_ops', 4, 1 FROM sys_dict_type WHERE dict_key = 'sys_role_type'
+AND NOT EXISTS (SELECT 1 FROM sys_dict_data WHERE dict_type_id = (SELECT id FROM sys_dict_type WHERE dict_key = 'sys_role_type') AND dict_value = 'field_ops');
+
+INSERT INTO sys_dict_data (dict_type_id, dict_label, dict_value, sort_order, status)
+SELECT id, '技术维护', 'tech_maintain', 5, 1 FROM sys_dict_type WHERE dict_key = 'sys_role_type'
+AND NOT EXISTS (SELECT 1 FROM sys_dict_data WHERE dict_type_id = (SELECT id FROM sys_dict_type WHERE dict_key = 'sys_role_type') AND dict_value = 'tech_maintain');
+
+-- 数据权限范围
+INSERT INTO sys_dict_data (dict_type_id, dict_label, dict_value, sort_order, status)
+SELECT id, '全部数据', 'ALL', 0, 1 FROM sys_dict_type WHERE dict_key = 'sys_data_scope'
+AND NOT EXISTS (SELECT 1 FROM sys_dict_data WHERE dict_type_id = (SELECT id FROM sys_dict_type WHERE dict_key = 'sys_data_scope') AND dict_value = 'ALL');
+
+INSERT INTO sys_dict_data (dict_type_id, dict_label, dict_value, sort_order, status)
+SELECT id, '部门数据', 'DEPT', 1, 1 FROM sys_dict_type WHERE dict_key = 'sys_data_scope'
+AND NOT EXISTS (SELECT 1 FROM sys_dict_data WHERE dict_type_id = (SELECT id FROM sys_dict_type WHERE dict_key = 'sys_data_scope') AND dict_value = 'DEPT');
+
+INSERT INTO sys_dict_data (dict_type_id, dict_label, dict_value, sort_order, status)
+SELECT id, '自定义数据', 'CUSTOM', 2, 1 FROM sys_dict_type WHERE dict_key = 'sys_data_scope'
+AND NOT EXISTS (SELECT 1 FROM sys_dict_data WHERE dict_type_id = (SELECT id FROM sys_dict_type WHERE dict_key = 'sys_data_scope') AND dict_value = 'CUSTOM');
+
+INSERT INTO sys_dict_data (dict_type_id, dict_label, dict_value, sort_order, status)
+SELECT id, '仅本人', 'SELF', 3, 1 FROM sys_dict_type WHERE dict_key = 'sys_data_scope'
+AND NOT EXISTS (SELECT 1 FROM sys_dict_data WHERE dict_type_id = (SELECT id FROM sys_dict_type WHERE dict_key = 'sys_data_scope') AND dict_value = 'SELF');

wm-base/src/test/java/com/water/base/service/SysDeptServiceTest.java

@@ -0,0 +1,84 @@
+package com.water.base.service;
+
+import com.water.base.entity.SysDept;
+import com.water.base.mapper.SysDeptMapper;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+@ExtendWith(MockitoExtension.class)
+class SysDeptServiceTest {
+
+    @Mock
+    private SysDeptMapper deptMapper;
+
+    @InjectMocks
+    private SysDeptService deptService;
+
+    @Test
+    void buildDeptTree_shouldBuildCorrectHierarchy() {
+        SysDept root = new SysDept();
+        root.setId(1L);
+        root.setParentId(0L);
+        root.setDeptName("总公司");
+
+        SysDept child1 = new SysDept();
+        child1.setId(2L);
+        child1.setParentId(1L);
+        child1.setDeptName("技术部");
+
+        SysDept child2 = new SysDept();
+        child2.setId(3L);
+        child2.setParentId(1L);
+        child2.setDeptName("市场部");
+
+        List<SysDept> tree = deptService.buildDeptTree(Arrays.asList(root, child1, child2));
+
+        assertEquals(1, tree.size());
+        assertEquals("总公司", tree.get(0).getDeptName());
+        assertEquals(2, tree.get(0).getChildren().size());
+    }
+
+    @Test
+    void buildDeptTree_shouldHandleEmptyList() {
+        List<SysDept> tree = deptService.buildDeptTree(List.of());
+        assertTrue(tree.isEmpty());
+    }
+
+    @Test
+    void buildDeptTree_shouldHandleMultipleRoots() {
+        SysDept root1 = new SysDept();
+        root1.setId(1L);
+        root1.setParentId(0L);
+        root1.setDeptName("公司A");
+
+        SysDept root2 = new SysDept();
+        root2.setId(2L);
+        root2.setParentId(0L);
+        root2.setDeptName("公司B");
+
+        List<SysDept> tree = deptService.buildDeptTree(Arrays.asList(root1, root2));
+
+        assertEquals(2, tree.size());
+    }
+
+    @Test
+    void buildDeptTree_shouldHandleNullParentId() {
+        SysDept root = new SysDept();
+        root.setId(1L);
+        root.setParentId(null);
+        root.setDeptName("顶级部门");
+
+        List<SysDept> tree = deptService.buildDeptTree(List.of(root));
+
+        assertEquals(1, tree.size());
+        assertEquals("顶级部门", tree.get(0).getDeptName());
+    }
+}

wm-base/src/test/java/com/water/base/service/SysDictionaryServiceTest.java

@@ -0,0 +1,130 @@
+package com.water.base.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.water.base.entity.SysDictData;
+import com.water.base.entity.SysDictType;
+import com.water.base.mapper.SysDictDataMapper;
+import com.water.base.mapper.SysDictTypeMapper;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class SysDictionaryServiceTest {
+
+    @Mock
+    private SysDictTypeMapper dictTypeMapper;
+
+    @Mock
+    private SysDictDataMapper dictDataMapper;
+
+    @InjectMocks
+    private SysDictionaryService dictionaryService;
+
+    @Test
+    void listTypes_shouldReturnAllWhenNameIsNull() {
+        SysDictType type1 = new SysDictType();
+        type1.setId(1L);
+        type1.setDictName("用户性别");
+        type1.setDictKey("sys_user_gender");
+
+        when(dictTypeMapper.selectList(any(LambdaQueryWrapper.class)))
+            .thenReturn(Collections.singletonList(type1));
+
+        List<SysDictType> result = dictionaryService.listTypes(null);
+
+        assertEquals(1, result.size());
+        assertEquals("用户性别", result.get(0).getDictName());
+    }
+
+    @Test
+    void listDataByKey_shouldReturnDataFromCache() {
+        // First call populates cache
+        SysDictType type = new SysDictType();
+        type.setId(1L);
+        type.setDictKey("sys_user_gender");
+
+        SysDictData data1 = new SysDictData();
+        data1.setDictLabel("男");
+        data1.setDictValue("1");
+
+        when(dictTypeMapper.selectOne(any(LambdaQueryWrapper.class))).thenReturn(type);
+        when(dictDataMapper.selectList(any(LambdaQueryWrapper.class)))
+            .thenReturn(Collections.singletonList(data1));
+
+        List<SysDictData> result1 = dictionaryService.listDataByKey("sys_user_gender");
+        assertEquals(1, result1.size());
+
+        // Second call should use cache (no additional DB calls)
+        List<SysDictData> result2 = dictionaryService.listDataByKey("sys_user_gender");
+        assertEquals(1, result2.size());
+
+        // selectOne called only once because second time it's cached
+        verify(dictTypeMapper, times(1)).selectOne(any(LambdaQueryWrapper.class));
+    }
+
+    @Test
+    void listDataByKey_shouldReturnEmptyWhenKeyNotFound() {
+        when(dictTypeMapper.selectOne(any(LambdaQueryWrapper.class))).thenReturn(null);
+
+        List<SysDictData> result = dictionaryService.listDataByKey("nonexistent_key");
+
+        assertTrue(result.isEmpty());
+    }
+
+    @Test
+    void createType_shouldSaveAndEvictCache() {
+        SysDictType type = new SysDictType();
+        type.setDictName("测试字典");
+        type.setDictKey("test_dict");
+
+        dictionaryService.createType(type);
+
+        verify(dictTypeMapper, times(1)).insert(type);
+    }
+
+    @Test
+    void deleteType_shouldRemoveTypeAndData() {
+        SysDictType type = new SysDictType();
+        type.setId(1L);
+        type.setDictKey("test_dict");
+
+        when(dictTypeMapper.selectById(1L)).thenReturn(type);
+        when(dictDataMapper.delete(any(LambdaQueryWrapper.class))).thenReturn(2);
+
+        dictionaryService.deleteType(1L);
+
+        verify(dictDataMapper, times(1)).delete(any(LambdaQueryWrapper.class));
+        verify(dictTypeMapper, times(1)).deleteById(1L);
+    }
+
+    @Test
+    void clearCache_shouldClearAllCachedData() {
+        // Populate cache
+        SysDictType type = new SysDictType();
+        type.setId(1L);
+        type.setDictKey("test_key");
+
+        when(dictTypeMapper.selectOne(any(LambdaQueryWrapper.class))).thenReturn(type);
+        when(dictDataMapper.selectList(any(LambdaQueryWrapper.class))).thenReturn(Collections.emptyList());
+
+        dictionaryService.listDataByKey("test_key");
+
+        // Clear cache
+        dictionaryService.clearCache();
+
+        // Next call should hit DB again
+        dictionaryService.listDataByKey("test_key");
+        verify(dictTypeMapper, times(2)).selectOne(any(LambdaQueryWrapper.class));
+    }
+}

wm-base/src/test/java/com/water/base/service/SysOperationLogServiceTest.java

@@ -0,0 +1,52 @@
+package com.water.base.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.water.base.entity.SysOperationLog;
+import com.water.base.mapper.SysOperationLogMapper;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class SysOperationLogServiceTest {
+
+    @Mock
+    private SysOperationLogMapper logMapper;
+
+    @InjectMocks
+    private SysOperationLogService logService;
+
+    @Test
+    void queryForExport_shouldLimitTo10000() {
+        SysOperationLog log1 = new SysOperationLog();
+        log1.setId(1L);
+        log1.setModule("系统管理");
+        log1.setOperation("创建用户");
+
+        when(logMapper.selectList(any(LambdaQueryWrapper.class)))
+            .thenReturn(List.of(log1));
+
+        List<SysOperationLog> result = logService.queryForExport(null, null, null, null, null, null);
+
+        assertFalse(result.isEmpty());
+        assertEquals("系统管理", result.get(0).getModule());
+    }
+
+    @Test
+    void cleanAll_shouldRemoveAllLogs() {
+        when(logMapper.delete(any(LambdaQueryWrapper.class))).thenReturn(100);
+
+        logService.cleanAll();
+
+        verify(logMapper, times(1)).delete(any(LambdaQueryWrapper.class));
+    }
+}

wm-base/src/test/java/com/water/base/service/SysRoleServiceTest.java

@@ -0,0 +1,116 @@
+package com.water.base.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.water.base.entity.SysRole;
+import com.water.base.mapper.SysRoleMapper;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class SysRoleServiceTest {
+
+    @Mock
+    private SysRoleMapper roleMapper;
+
+    @InjectMocks
+    private SysRoleService roleService;
+
+    @Test
+    void presets_shouldReturn5Levels() {
+        List<SysRoleService.RolePreset> presets = roleService.getPresets();
+
+        assertEquals(5, presets.size());
+        assertEquals("admin", presets.get(0).roleKey());
+        assertEquals("supervisor", presets.get(1).roleKey());
+        assertEquals("biz_manager", presets.get(2).roleKey());
+        assertEquals("field_ops", presets.get(3).roleKey());
+        assertEquals("tech_maintain", presets.get(4).roleKey());
+    }
+
+    @Test
+    void permissionMatrix_adminShouldHaveFullAccess() {
+        Map<String, List<String>> perms = roleService.getRolePermissions("admin");
+
+        assertFalse(perms.isEmpty());
+        assertTrue(perms.containsKey("system"));
+        assertTrue(perms.get("system").contains("read"));
+        assertTrue(perms.get("system").contains("write"));
+        assertTrue(perms.get("system").contains("delete"));
+        assertTrue(perms.get("system").contains("export"));
+    }
+
+    @Test
+    void permissionMatrix_fieldOpsShouldHaveLimitedAccess() {
+        Map<String, List<String>> perms = roleService.getRolePermissions("field_ops");
+
+        assertFalse(perms.isEmpty());
+        assertFalse(perms.containsKey("system"));
+        assertTrue(perms.containsKey("dispatch"));
+        assertTrue(perms.containsKey("monitor"));
+    }
+
+    @Test
+    void permissionMatrix_unknownRoleShouldReturnEmpty() {
+        Map<String, List<String>> perms = roleService.getRolePermissions("unknown_role");
+
+        assertTrue(perms.isEmpty());
+    }
+
+    @Test
+    void initPresets_shouldSkipExistingRoles() {
+        // admin already exists
+        SysRole existingAdmin = new SysRole();
+        existingAdmin.setRoleKey("admin");
+
+        when(roleMapper.selectOne(any(LambdaQueryWrapper.class)))
+            .thenReturn(existingAdmin)  // admin exists
+            .thenReturn(null)           // supervisor doesn't exist
+            .thenReturn(null)           // biz_manager doesn't exist
+            .thenReturn(null)           // field_ops doesn't exist
+            .thenReturn(null);          // tech_maintain doesn't exist
+
+        roleService.initPresets();
+
+        // admin should NOT be inserted (already exists), others should be inserted
+        verify(roleMapper, times(4)).insert(any(SysRole.class));
+    }
+
+    @Test
+    void initPresets_shouldCreateAllWhenNoneExist() {
+        when(roleMapper.selectOne(any(LambdaQueryWrapper.class))).thenReturn(null);
+
+        roleService.initPresets();
+
+        verify(roleMapper, times(5)).insert(any(SysRole.class));
+    }
+
+    @Test
+    void presets_shouldHaveCorrectSortOrder() {
+        List<SysRoleService.RolePreset> presets = roleService.getPresets();
+
+        for (int i = 0; i < presets.size(); i++) {
+            assertEquals(i + 1, presets.get(i).roleSort());
+        }
+    }
+
+    @Test
+    void presets_shouldHaveCorrectDataScope() {
+        List<SysRoleService.RolePreset> presets = roleService.getPresets();
+
+        assertEquals("ALL", presets.get(0).dataScope());   // admin
+        assertEquals("ALL", presets.get(1).dataScope());   // supervisor
+        assertEquals("DEPT", presets.get(2).dataScope());  // biz_manager
+        assertEquals("DEPT", presets.get(3).dataScope());  // field_ops
+        assertEquals("SELF", presets.get(4).dataScope());  // tech_maintain
+    }
+}