Compare commits
2 Commits
16f9a325d7
...
d3f1f97a83
| Author | SHA1 | Date | |
|---|---|---|---|
| d3f1f97a83 | |||
| 7188dd49b5 |
63
frontend/src/api/__tests__/sysEnums.spec.ts
Normal file
63
frontend/src/api/__tests__/sysEnums.spec.ts
Normal file
@@ -0,0 +1,63 @@
|
||||
import { describe, expect, it, vi } from 'vitest';
|
||||
|
||||
import { batchSave, deleteById, listForManagement, saveOrUpdate } from '../sysEnums';
|
||||
import { del, post } from '../request';
|
||||
|
||||
vi.mock('../request', () => ({
|
||||
del: vi.fn(),
|
||||
post: vi.fn(),
|
||||
}));
|
||||
|
||||
describe('sys enum api', () => {
|
||||
it('queries system enums with management filters', () => {
|
||||
listForManagement({ catalog: 'common', keyword: '启用' });
|
||||
|
||||
expect(post).toHaveBeenCalledWith('/sys-enums/manage/query', {
|
||||
catalog: 'common',
|
||||
keyword: '启用',
|
||||
});
|
||||
});
|
||||
|
||||
it('saves and deletes system enums', () => {
|
||||
saveOrUpdate({ catalog: 'common', type: 'status', name: '启用', value: 1 });
|
||||
deleteById('123');
|
||||
|
||||
expect(post).toHaveBeenCalledWith('/sys-enums', {
|
||||
catalog: 'common',
|
||||
type: 'status',
|
||||
name: '启用',
|
||||
value: 1,
|
||||
});
|
||||
expect(del).toHaveBeenCalledWith('/sys-enums/123');
|
||||
});
|
||||
|
||||
it('batch saves enum groups', () => {
|
||||
batchSave({
|
||||
catalog: 'common',
|
||||
type: 'enable_status',
|
||||
items: [
|
||||
{
|
||||
name: '启用',
|
||||
value: 1,
|
||||
strvalue: 'enabled',
|
||||
sort: 1,
|
||||
remark: '通用启用状态',
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
expect(post).toHaveBeenCalledWith('/sys-enums/batch', {
|
||||
catalog: 'common',
|
||||
type: 'enable_status',
|
||||
items: [
|
||||
{
|
||||
name: '启用',
|
||||
value: 1,
|
||||
strvalue: 'enabled',
|
||||
sort: 1,
|
||||
remark: '通用启用状态',
|
||||
},
|
||||
],
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -2,8 +2,8 @@ import axios from 'axios';
|
||||
import type { AxiosRequestConfig } from 'axios';
|
||||
|
||||
export interface RequestResult<T> {
|
||||
code: number;
|
||||
message: string;
|
||||
resultcode: string;
|
||||
message: string | null;
|
||||
data: T;
|
||||
}
|
||||
|
||||
@@ -19,3 +19,7 @@ export function get<T>(url: string, config?: AxiosRequestConfig) {
|
||||
export function post<T, D = unknown>(url: string, data?: D, config?: AxiosRequestConfig) {
|
||||
return request.post<RequestResult<T>>(url, data, config).then((response) => response.data);
|
||||
}
|
||||
|
||||
export function del<T>(url: string, config?: AxiosRequestConfig) {
|
||||
return request.delete<RequestResult<T>>(url, config).then((response) => response.data);
|
||||
}
|
||||
|
||||
54
frontend/src/api/sysEnums.ts
Normal file
54
frontend/src/api/sysEnums.ts
Normal file
@@ -0,0 +1,54 @@
|
||||
import { del, get, post } from './request';
|
||||
|
||||
export interface SysEnum {
|
||||
id?: string;
|
||||
catalog: string;
|
||||
type: string;
|
||||
name: string;
|
||||
value?: number | null;
|
||||
strvalue?: string | null;
|
||||
sort?: number | null;
|
||||
remark?: string | null;
|
||||
}
|
||||
|
||||
export interface SysEnumManageQuery {
|
||||
catalog?: string;
|
||||
type?: string;
|
||||
keyword?: string;
|
||||
}
|
||||
|
||||
export type SysEnumSaveRequest = SysEnum;
|
||||
|
||||
export interface SysEnumBatchSaveItem {
|
||||
name: string;
|
||||
value?: number | null;
|
||||
strvalue?: string | null;
|
||||
sort?: number | null;
|
||||
remark?: string | null;
|
||||
}
|
||||
|
||||
export interface SysEnumBatchSaveRequest {
|
||||
catalog: string;
|
||||
type: string;
|
||||
items: SysEnumBatchSaveItem[];
|
||||
}
|
||||
|
||||
export function listForManagement(query: SysEnumManageQuery) {
|
||||
return post<SysEnum[], SysEnumManageQuery>('/sys-enums/manage/query', query);
|
||||
}
|
||||
|
||||
export function getById(id: string) {
|
||||
return get<SysEnum>(`/sys-enums/${id}`);
|
||||
}
|
||||
|
||||
export function saveOrUpdate(data: SysEnumSaveRequest) {
|
||||
return post<boolean, SysEnumSaveRequest>('/sys-enums', data);
|
||||
}
|
||||
|
||||
export function batchSave(data: SysEnumBatchSaveRequest) {
|
||||
return post<boolean, SysEnumBatchSaveRequest>('/sys-enums/batch', data);
|
||||
}
|
||||
|
||||
export function deleteById(id: string) {
|
||||
return del<boolean>(`/sys-enums/${id}`);
|
||||
}
|
||||
@@ -1,8 +1,404 @@
|
||||
<script setup lang="ts">
|
||||
import { Delete, Edit, Plus, Refresh, Search } from '@element-plus/icons-vue';
|
||||
import { ElMessage, ElMessageBox } from 'element-plus';
|
||||
import { computed, onMounted, reactive, ref } from 'vue';
|
||||
|
||||
import {
|
||||
batchSave,
|
||||
deleteById,
|
||||
listForManagement,
|
||||
saveOrUpdate,
|
||||
type SysEnum,
|
||||
type SysEnumBatchSaveItem,
|
||||
type SysEnumManageQuery,
|
||||
} from '@/api/sysEnums';
|
||||
|
||||
const loading = ref(false);
|
||||
const saving = ref(false);
|
||||
const dialogVisible = ref(false);
|
||||
const batchDialogVisible = ref(false);
|
||||
const enumRows = ref<SysEnum[]>([]);
|
||||
|
||||
const queryForm = reactive<Required<SysEnumManageQuery>>({
|
||||
catalog: '',
|
||||
type: '',
|
||||
keyword: '',
|
||||
});
|
||||
|
||||
const editForm = reactive<SysEnum>({
|
||||
catalog: '',
|
||||
type: '',
|
||||
name: '',
|
||||
value: null,
|
||||
strvalue: '',
|
||||
sort: 0,
|
||||
remark: '',
|
||||
});
|
||||
|
||||
const batchForm = reactive<{
|
||||
catalog: string;
|
||||
type: string;
|
||||
items: SysEnumBatchSaveItem[];
|
||||
}>({
|
||||
catalog: '',
|
||||
type: '',
|
||||
items: [],
|
||||
});
|
||||
|
||||
const dialogTitle = computed(() => (editForm.id ? '编辑枚举' : '新增枚举'));
|
||||
|
||||
function createBatchItem(sort = 0): SysEnumBatchSaveItem {
|
||||
return {
|
||||
name: '',
|
||||
value: null,
|
||||
strvalue: '',
|
||||
sort,
|
||||
remark: '',
|
||||
};
|
||||
}
|
||||
|
||||
function resetEditForm(row?: SysEnum) {
|
||||
editForm.id = row?.id;
|
||||
editForm.catalog = row?.catalog ?? '';
|
||||
editForm.type = row?.type ?? '';
|
||||
editForm.name = row?.name ?? '';
|
||||
editForm.value = row?.value ?? null;
|
||||
editForm.strvalue = row?.strvalue ?? '';
|
||||
editForm.sort = row?.sort ?? 0;
|
||||
editForm.remark = row?.remark ?? '';
|
||||
}
|
||||
|
||||
async function loadEnums() {
|
||||
loading.value = true;
|
||||
try {
|
||||
const response = await listForManagement({ ...queryForm });
|
||||
enumRows.value = response.data ?? [];
|
||||
} finally {
|
||||
loading.value = false;
|
||||
}
|
||||
}
|
||||
|
||||
function resetQuery() {
|
||||
queryForm.catalog = '';
|
||||
queryForm.type = '';
|
||||
queryForm.keyword = '';
|
||||
loadEnums();
|
||||
}
|
||||
|
||||
function openCreateDialog() {
|
||||
resetEditForm();
|
||||
dialogVisible.value = true;
|
||||
}
|
||||
|
||||
function openBatchCreateDialog() {
|
||||
batchForm.catalog = '';
|
||||
batchForm.type = '';
|
||||
batchForm.items = [createBatchItem(1), createBatchItem(2)];
|
||||
batchDialogVisible.value = true;
|
||||
}
|
||||
|
||||
function openEditDialog(row: SysEnum) {
|
||||
resetEditForm(row);
|
||||
dialogVisible.value = true;
|
||||
}
|
||||
|
||||
function addBatchItem() {
|
||||
batchForm.items.push(createBatchItem(batchForm.items.length + 1));
|
||||
}
|
||||
|
||||
function removeBatchItem(index: number) {
|
||||
batchForm.items.splice(index, 1);
|
||||
if (batchForm.items.length === 0) {
|
||||
addBatchItem();
|
||||
}
|
||||
}
|
||||
|
||||
async function submitEnum() {
|
||||
if (!editForm.catalog || !editForm.type || !editForm.name) {
|
||||
ElMessage.warning('请填写模块目录、枚举类型和名称');
|
||||
return;
|
||||
}
|
||||
|
||||
saving.value = true;
|
||||
try {
|
||||
await saveOrUpdate({ ...editForm });
|
||||
ElMessage.success('保存成功');
|
||||
dialogVisible.value = false;
|
||||
await loadEnums();
|
||||
} finally {
|
||||
saving.value = false;
|
||||
}
|
||||
}
|
||||
|
||||
function validateBatchForm() {
|
||||
if (!batchForm.catalog || !batchForm.type) {
|
||||
ElMessage.warning('请填写模块目录和枚举类型');
|
||||
return false;
|
||||
}
|
||||
if (batchForm.items.length === 0) {
|
||||
ElMessage.warning('请至少添加一个枚举项');
|
||||
return false;
|
||||
}
|
||||
|
||||
const requestValues = new Set<number>();
|
||||
const existingValues = new Set(
|
||||
enumRows.value
|
||||
.filter((row) => row.catalog === batchForm.catalog && row.type === batchForm.type)
|
||||
.map((row) => row.value)
|
||||
.filter((value): value is number => value !== null && value !== undefined),
|
||||
);
|
||||
|
||||
for (const item of batchForm.items) {
|
||||
if (!item.name) {
|
||||
ElMessage.warning('请填写每个枚举项的名称');
|
||||
return false;
|
||||
}
|
||||
if (item.value === null || item.value === undefined) {
|
||||
ElMessage.warning('请填写每个枚举项的整型值');
|
||||
return false;
|
||||
}
|
||||
if (requestValues.has(item.value)) {
|
||||
ElMessage.warning(`批量新增中存在重复整型值:${item.value}`);
|
||||
return false;
|
||||
}
|
||||
if (existingValues.has(item.value)) {
|
||||
ElMessage.warning(`整型值已存在:${item.value}`);
|
||||
return false;
|
||||
}
|
||||
requestValues.add(item.value);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
async function submitBatchEnums() {
|
||||
if (!validateBatchForm()) {
|
||||
return;
|
||||
}
|
||||
|
||||
saving.value = true;
|
||||
try {
|
||||
await batchSave({
|
||||
catalog: batchForm.catalog,
|
||||
type: batchForm.type,
|
||||
items: batchForm.items,
|
||||
});
|
||||
ElMessage.success('批量保存成功');
|
||||
batchDialogVisible.value = false;
|
||||
await loadEnums();
|
||||
} finally {
|
||||
saving.value = false;
|
||||
}
|
||||
}
|
||||
|
||||
async function removeEnum(row: SysEnum) {
|
||||
if (!row.id) {
|
||||
return;
|
||||
}
|
||||
await ElMessageBox.confirm(`确认删除枚举「${row.name}」?`, '删除确认', {
|
||||
type: 'warning',
|
||||
confirmButtonText: '删除',
|
||||
cancelButtonText: '取消',
|
||||
});
|
||||
await deleteById(row.id);
|
||||
ElMessage.success('删除成功');
|
||||
await loadEnums();
|
||||
}
|
||||
|
||||
onMounted(loadEnums);
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<section class="page-panel">
|
||||
<section class="page-panel enum-page">
|
||||
<div class="page-panel__header">
|
||||
<h2>系统枚举</h2>
|
||||
<span>System</span>
|
||||
</div>
|
||||
|
||||
<div class="enum-toolbar">
|
||||
<el-form :model="queryForm" inline>
|
||||
<el-form-item label="模块目录">
|
||||
<el-input
|
||||
v-model="queryForm.catalog"
|
||||
data-test="catalog-input"
|
||||
clearable
|
||||
placeholder="如 common"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="枚举类型">
|
||||
<el-input v-model="queryForm.type" clearable placeholder="如 enable_status" />
|
||||
</el-form-item>
|
||||
<el-form-item label="关键字">
|
||||
<el-input v-model="queryForm.keyword" clearable placeholder="名称/值/备注" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button data-test="enum-search" type="primary" :icon="Search" @click="loadEnums">
|
||||
搜索
|
||||
</el-button>
|
||||
<el-button :icon="Refresh" @click="resetQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<div class="enum-actions">
|
||||
<el-button data-test="enum-batch-create" :icon="Plus" @click="openBatchCreateDialog">
|
||||
批量新增
|
||||
</el-button>
|
||||
<el-button type="primary" :icon="Plus" @click="openCreateDialog">新增</el-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<el-table v-loading="loading" :data="enumRows" row-key="id" class="enum-table">
|
||||
<el-table-column prop="catalog" label="模块目录" min-width="120" />
|
||||
<el-table-column prop="type" label="枚举类型" min-width="160" />
|
||||
<el-table-column prop="name" label="名称" min-width="120" />
|
||||
<el-table-column prop="value" label="整型值" width="90" />
|
||||
<el-table-column prop="strvalue" label="字符串值" min-width="120" show-overflow-tooltip />
|
||||
<el-table-column prop="sort" label="排序" width="80" />
|
||||
<el-table-column prop="remark" label="注释" min-width="180" show-overflow-tooltip />
|
||||
<el-table-column label="操作" width="150" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-button link type="primary" :icon="Edit" @click="openEditDialog(row)">编辑</el-button>
|
||||
<el-button link type="danger" :icon="Delete" @click="removeEnum(row)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<el-dialog v-model="dialogVisible" :title="dialogTitle" width="560px">
|
||||
<el-form :model="editForm" label-width="96px">
|
||||
<el-form-item label="模块目录" required>
|
||||
<el-input v-model="editForm.catalog" placeholder="如 common" />
|
||||
</el-form-item>
|
||||
<el-form-item label="枚举类型" required>
|
||||
<el-input v-model="editForm.type" placeholder="如 enable_status" />
|
||||
</el-form-item>
|
||||
<el-form-item label="名称" required>
|
||||
<el-input v-model="editForm.name" placeholder="如 启用" />
|
||||
</el-form-item>
|
||||
<el-form-item label="整型值">
|
||||
<el-input-number v-model="editForm.value" :min="0" controls-position="right" />
|
||||
</el-form-item>
|
||||
<el-form-item label="字符串值">
|
||||
<el-input v-model="editForm.strvalue" placeholder="可选" />
|
||||
</el-form-item>
|
||||
<el-form-item label="排序">
|
||||
<el-input-number v-model="editForm.sort" :min="0" controls-position="right" />
|
||||
</el-form-item>
|
||||
<el-form-item label="注释">
|
||||
<el-input v-model="editForm.remark" type="textarea" :rows="3" placeholder="可选" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button @click="dialogVisible = false">取消</el-button>
|
||||
<el-button type="primary" :loading="saving" @click="submitEnum">保存</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog v-model="batchDialogVisible" title="批量新增枚举" width="920px">
|
||||
<el-form :model="batchForm" label-width="96px">
|
||||
<div class="batch-base">
|
||||
<el-form-item label="模块目录" required>
|
||||
<el-input v-model="batchForm.catalog" placeholder="如 common" />
|
||||
</el-form-item>
|
||||
<el-form-item label="枚举类型" required>
|
||||
<el-input v-model="batchForm.type" placeholder="如 enable_status" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="batch-header">
|
||||
<span>枚举项</span>
|
||||
<el-button :icon="Plus" @click="addBatchItem">添加一行</el-button>
|
||||
</div>
|
||||
|
||||
<el-table :data="batchForm.items" class="batch-table" row-key="sort">
|
||||
<el-table-column label="名称" min-width="140">
|
||||
<template #default="{ row }">
|
||||
<el-input v-model="row.name" placeholder="如 启用" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="整型值" width="130">
|
||||
<template #default="{ row }">
|
||||
<el-input-number v-model="row.value" :min="0" controls-position="right" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="字符串值" min-width="140">
|
||||
<template #default="{ row }">
|
||||
<el-input v-model="row.strvalue" placeholder="可选" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="排序" width="120">
|
||||
<template #default="{ row }">
|
||||
<el-input-number v-model="row.sort" :min="0" controls-position="right" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="注释" min-width="180">
|
||||
<template #default="{ row }">
|
||||
<el-input v-model="row.remark" placeholder="可选" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="90">
|
||||
<template #default="{ $index }">
|
||||
<el-button link type="danger" :icon="Delete" @click="removeBatchItem($index)">
|
||||
删除
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button @click="batchDialogVisible = false">取消</el-button>
|
||||
<el-button type="primary" :loading="saving" @click="submitBatchEnums">保存整组</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</section>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.enum-page {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.enum-toolbar {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
justify-content: space-between;
|
||||
gap: 16px;
|
||||
padding: 16px 18px 4px;
|
||||
}
|
||||
|
||||
.enum-toolbar :deep(.el-form-item) {
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
.enum-toolbar :deep(.el-input) {
|
||||
width: 180px;
|
||||
}
|
||||
|
||||
.enum-table {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.enum-actions {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.batch-base {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
gap: 12px;
|
||||
}
|
||||
|
||||
.batch-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin: 4px 0 12px;
|
||||
color: #1f2937;
|
||||
font-size: 14px;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.batch-table {
|
||||
width: 100%;
|
||||
}
|
||||
</style>
|
||||
|
||||
72
frontend/src/pages/__tests__/SystemEnumsPage.spec.ts
Normal file
72
frontend/src/pages/__tests__/SystemEnumsPage.spec.ts
Normal file
@@ -0,0 +1,72 @@
|
||||
import { mount, flushPromises } from '@vue/test-utils';
|
||||
import ElementPlus from 'element-plus';
|
||||
import { describe, expect, it, vi } from 'vitest';
|
||||
|
||||
import SystemEnumsPage from '../SystemEnumsPage.vue';
|
||||
import { listForManagement } from '@/api/sysEnums';
|
||||
|
||||
vi.mock('@/api/sysEnums', () => ({
|
||||
listForManagement: vi.fn(() =>
|
||||
Promise.resolve({
|
||||
resultcode: '0',
|
||||
message: null,
|
||||
data: [
|
||||
{
|
||||
id: '1',
|
||||
catalog: 'common',
|
||||
type: 'enable_status',
|
||||
name: '启用',
|
||||
value: 1,
|
||||
strvalue: 'enabled',
|
||||
sort: 1,
|
||||
remark: '通用启用状态',
|
||||
},
|
||||
],
|
||||
}),
|
||||
),
|
||||
saveOrUpdate: vi.fn(),
|
||||
batchSave: vi.fn(),
|
||||
deleteById: vi.fn(),
|
||||
}));
|
||||
|
||||
describe('SystemEnumsPage', () => {
|
||||
it('renders enum rows and sends search filters', async () => {
|
||||
const wrapper = mount(SystemEnumsPage, {
|
||||
global: {
|
||||
plugins: [ElementPlus],
|
||||
},
|
||||
});
|
||||
|
||||
await flushPromises();
|
||||
|
||||
expect(wrapper.text()).toContain('模块目录');
|
||||
expect(wrapper.text()).toContain('枚举类型');
|
||||
expect(wrapper.text()).toContain('common');
|
||||
expect(wrapper.text()).toContain('enable_status');
|
||||
expect(wrapper.text()).toContain('启用');
|
||||
expect(wrapper.text()).toContain('通用启用状态');
|
||||
|
||||
await wrapper.get('[data-test="catalog-input"]').setValue('rag');
|
||||
await wrapper.get('[data-test="enum-search"]').trigger('click');
|
||||
|
||||
expect(listForManagement).toHaveBeenLastCalledWith({
|
||||
catalog: 'rag',
|
||||
type: '',
|
||||
keyword: '',
|
||||
});
|
||||
});
|
||||
|
||||
it('opens a separate batch create dialog', async () => {
|
||||
const wrapper = mount(SystemEnumsPage, {
|
||||
global: {
|
||||
plugins: [ElementPlus],
|
||||
},
|
||||
});
|
||||
|
||||
await flushPromises();
|
||||
await wrapper.get('[data-test="enum-batch-create"]').trigger('click');
|
||||
|
||||
expect(wrapper.text()).toContain('批量新增枚举');
|
||||
expect(wrapper.text()).toContain('枚举项');
|
||||
});
|
||||
});
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.bruce.common.controller;
|
||||
|
||||
import com.bruce.common.domain.entity.SysAttachment;
|
||||
import com.bruce.common.domain.model.RequestResult;
|
||||
import com.bruce.common.dto.request.SysAttachmentUploadRequest;
|
||||
import com.bruce.common.dto.response.SysAttachmentResponse;
|
||||
import com.bruce.common.service.ISysAttachmentService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@@ -22,7 +22,7 @@ public class SysAttachmentController {
|
||||
|
||||
@Operation(summary = "上传附件")
|
||||
@PostMapping("/upload")
|
||||
public RequestResult<SysAttachment> upload(@ModelAttribute SysAttachmentUploadRequest request) {
|
||||
return RequestResult.success(sysAttachmentService.upload(request));
|
||||
public RequestResult<SysAttachmentResponse> upload(@ModelAttribute SysAttachmentUploadRequest request) {
|
||||
return RequestResult.success(SysAttachmentResponse.fromEntity(sysAttachmentService.upload(request)));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
package com.bruce.common.controller;
|
||||
|
||||
import com.bruce.common.domain.entity.SysEnum;
|
||||
import com.bruce.common.domain.model.RequestResult;
|
||||
import com.bruce.common.dto.request.SysEnumBatchSaveRequest;
|
||||
import com.bruce.common.dto.request.SysEnumManageQueryRequest;
|
||||
import com.bruce.common.dto.request.SysEnumQueryRequest;
|
||||
import com.bruce.common.dto.request.SysEnumSaveRequest;
|
||||
import com.bruce.common.dto.response.SysEnumResponse;
|
||||
import com.bruce.common.service.ISysEnumService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@@ -28,14 +30,26 @@ public class SysEnumController {
|
||||
|
||||
@Operation(summary = "查询全部系统枚举")
|
||||
@GetMapping
|
||||
public RequestResult<List<SysEnum>> list() {
|
||||
return RequestResult.success(sysEnumService.list());
|
||||
public RequestResult<List<SysEnumResponse>> list() {
|
||||
return RequestResult.success(sysEnumService.listResponses());
|
||||
}
|
||||
|
||||
@Operation(summary = "根据模块和类型查询系统枚举")
|
||||
@PostMapping("/query")
|
||||
public RequestResult<List<SysEnum>> queryByCatalogAndType(@RequestBody SysEnumQueryRequest request) {
|
||||
return RequestResult.success(sysEnumService.listByCatalogAndType(request));
|
||||
public RequestResult<List<SysEnumResponse>> queryByCatalogAndType(@RequestBody SysEnumQueryRequest request) {
|
||||
return RequestResult.success(sysEnumService.listByCatalogAndTypeResponses(request));
|
||||
}
|
||||
|
||||
@Operation(summary = "管理端查询系统枚举")
|
||||
@PostMapping("/manage/query")
|
||||
public RequestResult<List<SysEnumResponse>> queryForManagement(@RequestBody(required = false) SysEnumManageQueryRequest request) {
|
||||
return RequestResult.success(sysEnumService.listForManagement(request));
|
||||
}
|
||||
|
||||
@Operation(summary = "查询系统枚举详情")
|
||||
@GetMapping("/{id}")
|
||||
public RequestResult<SysEnumResponse> getById(@PathVariable Long id) {
|
||||
return RequestResult.success(sysEnumService.getResponseById(id));
|
||||
}
|
||||
|
||||
@Operation(summary = "新增或修改系统枚举")
|
||||
@@ -44,6 +58,12 @@ public class SysEnumController {
|
||||
return RequestResult.success(sysEnumService.saveOrUpdate(request));
|
||||
}
|
||||
|
||||
@Operation(summary = "批量新增系统枚举")
|
||||
@PostMapping("/batch")
|
||||
public RequestResult<Boolean> batchSave(@RequestBody SysEnumBatchSaveRequest request) {
|
||||
return RequestResult.success(sysEnumService.batchSave(request));
|
||||
}
|
||||
|
||||
@Operation(summary = "删除系统枚举")
|
||||
@DeleteMapping("/{id}")
|
||||
public RequestResult<Boolean> deleteById(@PathVariable Long id) {
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
package com.bruce.common.dto.request;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@Schema(description = "系统枚举批量保存请求")
|
||||
public class SysEnumBatchSaveRequest {
|
||||
|
||||
@Schema(description = "模块目录")
|
||||
private String catalog;
|
||||
|
||||
@Schema(description = "枚举类型")
|
||||
private String type;
|
||||
|
||||
@Schema(description = "枚举项")
|
||||
private List<Item> items;
|
||||
|
||||
@Data
|
||||
@Schema(description = "系统枚举批量保存项")
|
||||
public static class Item {
|
||||
|
||||
@Schema(description = "枚举名称")
|
||||
private String name;
|
||||
|
||||
@Schema(description = "整型值")
|
||||
private Integer value;
|
||||
|
||||
@Schema(description = "字符串值")
|
||||
private String strvalue;
|
||||
|
||||
@Schema(description = "排序")
|
||||
private Integer sort;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package com.bruce.common.dto.request;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@Schema(description = "系统枚举管理查询请求")
|
||||
public class SysEnumManageQueryRequest {
|
||||
|
||||
@Schema(description = "模块目录")
|
||||
private String catalog;
|
||||
|
||||
@Schema(description = "枚举类型")
|
||||
private String type;
|
||||
|
||||
@Schema(description = "关键字,匹配目录、类型、名称、字符串值或备注")
|
||||
private String keyword;
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
package com.bruce.common.dto.response;
|
||||
|
||||
import com.bruce.common.domain.entity.SysAttachment;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
|
||||
@Data
|
||||
@Schema(description = "系统附件响应")
|
||||
public class SysAttachmentResponse {
|
||||
|
||||
@Schema(description = "主键ID")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "来源业务类型")
|
||||
private String sourceType;
|
||||
|
||||
@Schema(description = "来源业务ID")
|
||||
private Long sourceId;
|
||||
|
||||
@Schema(description = "原始文件名")
|
||||
private String originalName;
|
||||
|
||||
@Schema(description = "存储文件名")
|
||||
private String fileName;
|
||||
|
||||
@Schema(description = "文件后缀")
|
||||
private String fileSuffix;
|
||||
|
||||
@Schema(description = "文件MIME类型")
|
||||
private String contentType;
|
||||
|
||||
@Schema(description = "文件大小(字节)")
|
||||
private Long fileSize;
|
||||
|
||||
@Schema(description = "存储类型")
|
||||
private String storageType;
|
||||
|
||||
@Schema(description = "文件访问地址")
|
||||
private String fileUrl;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
public static SysAttachmentResponse fromEntity(SysAttachment entity) {
|
||||
if (entity == null) {
|
||||
return null;
|
||||
}
|
||||
SysAttachmentResponse response = new SysAttachmentResponse();
|
||||
BeanUtils.copyProperties(entity, response);
|
||||
return response;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
package com.bruce.common.dto.response;
|
||||
|
||||
import com.bruce.common.domain.entity.SysEnum;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
|
||||
@Data
|
||||
@Schema(description = "系统枚举响应")
|
||||
public class SysEnumResponse {
|
||||
|
||||
@Schema(description = "主键ID")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "模块目录")
|
||||
private String catalog;
|
||||
|
||||
@Schema(description = "枚举类型")
|
||||
private String type;
|
||||
|
||||
@Schema(description = "枚举名称")
|
||||
private String name;
|
||||
|
||||
@Schema(description = "整型值")
|
||||
private Integer value;
|
||||
|
||||
@Schema(description = "字符串值")
|
||||
private String strvalue;
|
||||
|
||||
@Schema(description = "排序")
|
||||
private Integer sort;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
public static SysEnumResponse fromEntity(SysEnum entity) {
|
||||
if (entity == null) {
|
||||
return null;
|
||||
}
|
||||
SysEnumResponse response = new SysEnumResponse();
|
||||
BeanUtils.copyProperties(entity, response);
|
||||
return response;
|
||||
}
|
||||
}
|
||||
@@ -2,8 +2,11 @@ package com.bruce.common.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.bruce.common.domain.entity.SysEnum;
|
||||
import com.bruce.common.dto.request.SysEnumBatchSaveRequest;
|
||||
import com.bruce.common.dto.request.SysEnumManageQueryRequest;
|
||||
import com.bruce.common.dto.request.SysEnumQueryRequest;
|
||||
import com.bruce.common.dto.request.SysEnumSaveRequest;
|
||||
import com.bruce.common.dto.response.SysEnumResponse;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -11,5 +14,15 @@ public interface ISysEnumService extends IService<SysEnum> {
|
||||
|
||||
List<SysEnum> listByCatalogAndType(SysEnumQueryRequest request);
|
||||
|
||||
List<SysEnumResponse> listResponses();
|
||||
|
||||
List<SysEnumResponse> listByCatalogAndTypeResponses(SysEnumQueryRequest request);
|
||||
|
||||
List<SysEnumResponse> listForManagement(SysEnumManageQueryRequest request);
|
||||
|
||||
SysEnumResponse getResponseById(Long id);
|
||||
|
||||
boolean saveOrUpdate(SysEnumSaveRequest request);
|
||||
|
||||
boolean batchSave(SysEnumBatchSaveRequest request);
|
||||
}
|
||||
|
||||
@@ -2,14 +2,19 @@ package com.bruce.common.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.bruce.common.domain.entity.SysEnum;
|
||||
import com.bruce.common.dto.request.SysEnumBatchSaveRequest;
|
||||
import com.bruce.common.dto.request.SysEnumManageQueryRequest;
|
||||
import com.bruce.common.dto.request.SysEnumQueryRequest;
|
||||
import com.bruce.common.dto.request.SysEnumSaveRequest;
|
||||
import com.bruce.common.dto.response.SysEnumResponse;
|
||||
import com.bruce.common.mapper.SysEnumMapper;
|
||||
import com.bruce.common.service.ISysEnumService;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
@Service
|
||||
public class SysEnumServiceImpl extends ServiceImpl<SysEnumMapper, SysEnum> implements ISysEnumService {
|
||||
@@ -26,6 +31,45 @@ public class SysEnumServiceImpl extends ServiceImpl<SysEnumMapper, SysEnum> impl
|
||||
.list();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SysEnumResponse> listResponses() {
|
||||
return toResponses(list());
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SysEnumResponse> listByCatalogAndTypeResponses(SysEnumQueryRequest request) {
|
||||
return toResponses(listByCatalogAndType(request));
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SysEnumResponse> listForManagement(SysEnumManageQueryRequest request) {
|
||||
SysEnumManageQueryRequest queryRequest = request == null ? new SysEnumManageQueryRequest() : request;
|
||||
String keyword = queryRequest.getKeyword();
|
||||
return toResponses(lambdaQuery()
|
||||
.eq(StringUtils.hasText(queryRequest.getCatalog()), SysEnum::getCatalog, queryRequest.getCatalog())
|
||||
.eq(StringUtils.hasText(queryRequest.getType()), SysEnum::getType, queryRequest.getType())
|
||||
.and(StringUtils.hasText(keyword), wrapper -> wrapper
|
||||
.like(SysEnum::getCatalog, keyword)
|
||||
.or()
|
||||
.like(SysEnum::getType, keyword)
|
||||
.or()
|
||||
.like(SysEnum::getName, keyword)
|
||||
.or()
|
||||
.like(SysEnum::getStrvalue, keyword)
|
||||
.or()
|
||||
.like(SysEnum::getRemark, keyword))
|
||||
.orderByAsc(SysEnum::getCatalog)
|
||||
.orderByAsc(SysEnum::getType)
|
||||
.orderByAsc(SysEnum::getSort)
|
||||
.orderByAsc(SysEnum::getId)
|
||||
.list());
|
||||
}
|
||||
|
||||
@Override
|
||||
public SysEnumResponse getResponseById(Long id) {
|
||||
return SysEnumResponse.fromEntity(getById(id));
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean saveOrUpdate(SysEnumSaveRequest request) {
|
||||
if (request == null) {
|
||||
@@ -43,4 +87,77 @@ public class SysEnumServiceImpl extends ServiceImpl<SysEnumMapper, SysEnum> impl
|
||||
sysEnum.setRemark(request.getRemark());
|
||||
return super.saveOrUpdate(sysEnum);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean batchSave(SysEnumBatchSaveRequest request) {
|
||||
List<SysEnum> existingEnums = lambdaQuery()
|
||||
.eq(request != null && StringUtils.hasText(request.getCatalog()), SysEnum::getCatalog, request == null ? null : request.getCatalog())
|
||||
.eq(request != null && StringUtils.hasText(request.getType()), SysEnum::getType, request == null ? null : request.getType())
|
||||
.list();
|
||||
validateBatchSaveRequest(request, existingEnums);
|
||||
|
||||
List<SysEnum> enums = request.getItems().stream()
|
||||
.map(item -> {
|
||||
SysEnum sysEnum = new SysEnum();
|
||||
sysEnum.setCatalog(request.getCatalog());
|
||||
sysEnum.setType(request.getType());
|
||||
sysEnum.setName(item.getName());
|
||||
sysEnum.setValue(item.getValue());
|
||||
sysEnum.setStrvalue(item.getStrvalue());
|
||||
sysEnum.setSort(item.getSort());
|
||||
sysEnum.setRemark(item.getRemark());
|
||||
return sysEnum;
|
||||
})
|
||||
.toList();
|
||||
return saveBatch(enums);
|
||||
}
|
||||
|
||||
public void validateBatchSaveRequest(SysEnumBatchSaveRequest request, List<SysEnum> existingEnums) {
|
||||
if (request == null) {
|
||||
throw new IllegalArgumentException("批量保存请求不能为空");
|
||||
}
|
||||
if (!StringUtils.hasText(request.getCatalog())) {
|
||||
throw new IllegalArgumentException("模块目录不能为空");
|
||||
}
|
||||
if (!StringUtils.hasText(request.getType())) {
|
||||
throw new IllegalArgumentException("枚举类型不能为空");
|
||||
}
|
||||
if (request.getItems() == null || request.getItems().isEmpty()) {
|
||||
throw new IllegalArgumentException("枚举项不能为空");
|
||||
}
|
||||
|
||||
Set<Integer> requestValues = new HashSet<>();
|
||||
for (SysEnumBatchSaveRequest.Item item : request.getItems()) {
|
||||
if (item == null) {
|
||||
throw new IllegalArgumentException("枚举项不能为空");
|
||||
}
|
||||
if (!StringUtils.hasText(item.getName())) {
|
||||
throw new IllegalArgumentException("枚举名称不能为空");
|
||||
}
|
||||
if (item.getValue() == null) {
|
||||
throw new IllegalArgumentException("枚举整型值不能为空");
|
||||
}
|
||||
if (!requestValues.add(item.getValue())) {
|
||||
throw new IllegalArgumentException("批量保存请求中存在重复枚举值: " + item.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
Set<Integer> existingValues = new HashSet<>();
|
||||
if (existingEnums != null) {
|
||||
existingEnums.stream()
|
||||
.map(SysEnum::getValue)
|
||||
.forEach(existingValues::add);
|
||||
}
|
||||
for (Integer value : requestValues) {
|
||||
if (existingValues.contains(value)) {
|
||||
throw new IllegalArgumentException("枚举值已存在: " + value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private List<SysEnumResponse> toResponses(List<SysEnum> enums) {
|
||||
return enums.stream()
|
||||
.map(SysEnumResponse::fromEntity)
|
||||
.toList();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ package com.bruce.rag.controller;
|
||||
|
||||
import com.bruce.common.domain.model.RequestResult;
|
||||
import com.bruce.rag.dto.request.RagDocumentQueryRequest;
|
||||
import com.bruce.rag.entity.RagDocument;
|
||||
import com.bruce.rag.dto.response.RagDocumentResponse;
|
||||
import com.bruce.rag.service.IRagDocumentService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@@ -25,13 +25,13 @@ public class RagDocumentController {
|
||||
|
||||
@Operation(summary = "查询全部知识库文档")
|
||||
@GetMapping
|
||||
public RequestResult<List<RagDocument>> list() {
|
||||
return RequestResult.success(ragDocumentService.list());
|
||||
public RequestResult<List<RagDocumentResponse>> list() {
|
||||
return RequestResult.success(ragDocumentService.listResponses());
|
||||
}
|
||||
|
||||
@Operation(summary = "按条件查询知识库文档")
|
||||
@PostMapping("/query")
|
||||
public RequestResult<List<RagDocument>> query(@RequestBody RagDocumentQueryRequest request) {
|
||||
public RequestResult<List<RagDocumentResponse>> query(@RequestBody RagDocumentQueryRequest request) {
|
||||
return RequestResult.success(ragDocumentService.query(request));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ package com.bruce.rag.controller;
|
||||
|
||||
import com.bruce.common.domain.model.RequestResult;
|
||||
import com.bruce.rag.dto.request.RagStoreQueryRequest;
|
||||
import com.bruce.rag.entity.RagStore;
|
||||
import com.bruce.rag.dto.response.RagStoreResponse;
|
||||
import com.bruce.rag.service.IRagStoreService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@@ -25,13 +25,13 @@ public class RagStoreController {
|
||||
|
||||
@Operation(summary = "查询全部知识库")
|
||||
@GetMapping
|
||||
public RequestResult<List<RagStore>> list() {
|
||||
return RequestResult.success(ragStoreService.list());
|
||||
public RequestResult<List<RagStoreResponse>> list() {
|
||||
return RequestResult.success(ragStoreService.listResponses());
|
||||
}
|
||||
|
||||
@Operation(summary = "按条件查询知识库")
|
||||
@PostMapping("/query")
|
||||
public RequestResult<List<RagStore>> query(@RequestBody RagStoreQueryRequest request) {
|
||||
public RequestResult<List<RagStoreResponse>> query(@RequestBody RagStoreQueryRequest request) {
|
||||
return RequestResult.success(ragStoreService.query(request));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
package com.bruce.rag.dto.response;
|
||||
|
||||
import com.bruce.rag.entity.RagDocument;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
|
||||
@Data
|
||||
@Schema(description = "RAG知识库文档响应")
|
||||
public class RagDocumentResponse {
|
||||
|
||||
@Schema(description = "主键ID")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "知识库ID")
|
||||
private Long storeId;
|
||||
|
||||
@Schema(description = "附件ID")
|
||||
private Long attachmentId;
|
||||
|
||||
@Schema(description = "文档标题")
|
||||
private String documentTitle;
|
||||
|
||||
@Schema(description = "文档摘要")
|
||||
private String documentSummary;
|
||||
|
||||
@Schema(description = "解析状态")
|
||||
private String parseStatus;
|
||||
|
||||
@Schema(description = "索引状态")
|
||||
private String indexStatus;
|
||||
|
||||
@Schema(description = "是否启用")
|
||||
private Boolean enabled;
|
||||
|
||||
@Schema(description = "失败原因")
|
||||
private String errorMessage;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
public static RagDocumentResponse fromEntity(RagDocument entity) {
|
||||
if (entity == null) {
|
||||
return null;
|
||||
}
|
||||
RagDocumentResponse response = new RagDocumentResponse();
|
||||
BeanUtils.copyProperties(entity, response);
|
||||
return response;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
package com.bruce.rag.dto.response;
|
||||
|
||||
import com.bruce.rag.entity.RagStore;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
|
||||
@Data
|
||||
@Schema(description = "RAG知识库响应")
|
||||
public class RagStoreResponse {
|
||||
|
||||
@Schema(description = "主键ID")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "知识库编码")
|
||||
private String storeCode;
|
||||
|
||||
@Schema(description = "知识库名称")
|
||||
private String storeName;
|
||||
|
||||
@Schema(description = "知识库描述")
|
||||
private String description;
|
||||
|
||||
@Schema(description = "状态")
|
||||
private String status;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
public static RagStoreResponse fromEntity(RagStore entity) {
|
||||
if (entity == null) {
|
||||
return null;
|
||||
}
|
||||
RagStoreResponse response = new RagStoreResponse();
|
||||
BeanUtils.copyProperties(entity, response);
|
||||
return response;
|
||||
}
|
||||
}
|
||||
@@ -2,11 +2,14 @@ package com.bruce.rag.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.bruce.rag.dto.request.RagDocumentQueryRequest;
|
||||
import com.bruce.rag.dto.response.RagDocumentResponse;
|
||||
import com.bruce.rag.entity.RagDocument;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface IRagDocumentService extends IService<RagDocument> {
|
||||
|
||||
List<RagDocument> query(RagDocumentQueryRequest request);
|
||||
List<RagDocumentResponse> listResponses();
|
||||
|
||||
List<RagDocumentResponse> query(RagDocumentQueryRequest request);
|
||||
}
|
||||
|
||||
@@ -2,11 +2,14 @@ package com.bruce.rag.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.bruce.rag.dto.request.RagStoreQueryRequest;
|
||||
import com.bruce.rag.dto.response.RagStoreResponse;
|
||||
import com.bruce.rag.entity.RagStore;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface IRagStoreService extends IService<RagStore> {
|
||||
|
||||
List<RagStore> query(RagStoreQueryRequest request);
|
||||
List<RagStoreResponse> listResponses();
|
||||
|
||||
List<RagStoreResponse> query(RagStoreQueryRequest request);
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.bruce.rag.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.bruce.rag.dto.request.RagDocumentQueryRequest;
|
||||
import com.bruce.rag.dto.response.RagDocumentResponse;
|
||||
import com.bruce.rag.entity.RagDocument;
|
||||
import com.bruce.rag.mapper.RagDocumentMapper;
|
||||
import com.bruce.rag.service.IRagDocumentService;
|
||||
@@ -13,17 +14,28 @@ import java.util.List;
|
||||
public class RagDocumentServiceImpl extends ServiceImpl<RagDocumentMapper, RagDocument> implements IRagDocumentService {
|
||||
|
||||
@Override
|
||||
public List<RagDocument> query(RagDocumentQueryRequest request) {
|
||||
public List<RagDocumentResponse> listResponses() {
|
||||
return toResponses(list());
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<RagDocumentResponse> query(RagDocumentQueryRequest request) {
|
||||
if (request == null) {
|
||||
throw new IllegalArgumentException("查询请求不能为空");
|
||||
}
|
||||
return lambdaQuery()
|
||||
return toResponses(lambdaQuery()
|
||||
.eq(request.getStoreId() != null, RagDocument::getStoreId, request.getStoreId())
|
||||
.eq(request.getAttachmentId() != null, RagDocument::getAttachmentId, request.getAttachmentId())
|
||||
.eq(request.getParseStatus() != null, RagDocument::getParseStatus, request.getParseStatus())
|
||||
.eq(request.getIndexStatus() != null, RagDocument::getIndexStatus, request.getIndexStatus())
|
||||
.eq(request.getEnabled() != null, RagDocument::getEnabled, request.getEnabled())
|
||||
.orderByDesc(RagDocument::getId)
|
||||
.list();
|
||||
.list());
|
||||
}
|
||||
|
||||
private List<RagDocumentResponse> toResponses(List<RagDocument> documents) {
|
||||
return documents.stream()
|
||||
.map(RagDocumentResponse::fromEntity)
|
||||
.toList();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.bruce.rag.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.bruce.rag.dto.request.RagStoreQueryRequest;
|
||||
import com.bruce.rag.dto.response.RagStoreResponse;
|
||||
import com.bruce.rag.entity.RagStore;
|
||||
import com.bruce.rag.mapper.RagStoreMapper;
|
||||
import com.bruce.rag.service.IRagStoreService;
|
||||
@@ -14,15 +15,26 @@ import java.util.List;
|
||||
public class RagStoreServiceImpl extends ServiceImpl<RagStoreMapper, RagStore> implements IRagStoreService {
|
||||
|
||||
@Override
|
||||
public List<RagStore> query(RagStoreQueryRequest request) {
|
||||
public List<RagStoreResponse> listResponses() {
|
||||
return toResponses(list());
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<RagStoreResponse> query(RagStoreQueryRequest request) {
|
||||
if (request == null) {
|
||||
throw new IllegalArgumentException("查询请求不能为空");
|
||||
}
|
||||
return lambdaQuery()
|
||||
return toResponses(lambdaQuery()
|
||||
.eq(StringUtils.hasText(request.getStoreCode()), RagStore::getStoreCode, request.getStoreCode())
|
||||
.like(StringUtils.hasText(request.getStoreName()), RagStore::getStoreName, request.getStoreName())
|
||||
.eq(StringUtils.hasText(request.getStatus()), RagStore::getStatus, request.getStatus())
|
||||
.orderByAsc(RagStore::getStoreCode)
|
||||
.list();
|
||||
.list());
|
||||
}
|
||||
|
||||
private List<RagStoreResponse> toResponses(List<RagStore> stores) {
|
||||
return stores.stream()
|
||||
.map(RagStoreResponse::fromEntity)
|
||||
.toList();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@ import com.bruce.common.controller.SysAttachmentController;
|
||||
import com.bruce.common.domain.model.RequestResult;
|
||||
import com.bruce.common.dto.request.SysAttachmentUploadRequest;
|
||||
import com.bruce.common.domain.entity.SysAttachment;
|
||||
import com.bruce.common.dto.response.SysAttachmentResponse;
|
||||
import com.bruce.common.mapper.SysAttachmentMapper;
|
||||
import com.bruce.common.service.ISysAttachmentService;
|
||||
import com.bruce.common.service.impl.SysAttachmentServiceImpl;
|
||||
@@ -45,6 +46,8 @@ class SysAttachmentComponentStructureTests {
|
||||
assertNotNull(controllerMethod);
|
||||
assertEquals(SysAttachment.class, serviceMethod.getReturnType());
|
||||
assertEquals(RequestResult.class, controllerMethod.getReturnType());
|
||||
assertTrue(controllerMethod.getGenericReturnType().getTypeName().contains("SysAttachmentResponse"));
|
||||
assertEquals(SysAttachmentResponse.class, SysAttachmentResponse.class.getMethod("fromEntity", SysAttachment.class).getReturnType());
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
package com.bruce.common.enumconfig;
|
||||
|
||||
import com.bruce.common.domain.entity.SysEnum;
|
||||
import com.bruce.common.dto.request.SysEnumBatchSaveRequest;
|
||||
import com.bruce.common.service.impl.SysEnumServiceImpl;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
|
||||
class SysEnumBatchSaveValidationTests {
|
||||
|
||||
@Test
|
||||
void batchSaveShouldRejectDuplicateValuesInsideRequest() {
|
||||
SysEnumServiceImpl service = new SysEnumServiceImpl();
|
||||
SysEnumBatchSaveRequest request = new SysEnumBatchSaveRequest();
|
||||
request.setCatalog("common");
|
||||
request.setType("enable_status");
|
||||
request.setItems(List.of(
|
||||
item("启用", 1),
|
||||
item("可用", 1)
|
||||
));
|
||||
|
||||
assertThrows(IllegalArgumentException.class, () -> service.validateBatchSaveRequest(request, List.of()));
|
||||
}
|
||||
|
||||
@Test
|
||||
void batchSaveShouldRejectDuplicateValuesFromExistingEnums() {
|
||||
SysEnumServiceImpl service = new SysEnumServiceImpl();
|
||||
SysEnum existing = new SysEnum();
|
||||
existing.setCatalog("common");
|
||||
existing.setType("enable_status");
|
||||
existing.setValue(1);
|
||||
|
||||
SysEnumBatchSaveRequest request = new SysEnumBatchSaveRequest();
|
||||
request.setCatalog("common");
|
||||
request.setType("enable_status");
|
||||
request.setItems(List.of(item("启用", 1)));
|
||||
|
||||
assertThrows(
|
||||
IllegalArgumentException.class,
|
||||
() -> service.validateBatchSaveRequest(request, List.of(existing))
|
||||
);
|
||||
}
|
||||
|
||||
@Test
|
||||
void batchSaveShouldAcceptUniqueValues() {
|
||||
SysEnumServiceImpl service = new SysEnumServiceImpl();
|
||||
SysEnumBatchSaveRequest request = new SysEnumBatchSaveRequest();
|
||||
request.setCatalog("common");
|
||||
request.setType("enable_status");
|
||||
request.setItems(List.of(
|
||||
item("禁用", 0),
|
||||
item("启用", 1)
|
||||
));
|
||||
|
||||
assertDoesNotThrow(() -> service.validateBatchSaveRequest(request, List.of()));
|
||||
}
|
||||
|
||||
private SysEnumBatchSaveRequest.Item item(String name, Integer value) {
|
||||
SysEnumBatchSaveRequest.Item item = new SysEnumBatchSaveRequest.Item();
|
||||
item.setName(name);
|
||||
item.setValue(value);
|
||||
return item;
|
||||
}
|
||||
}
|
||||
@@ -6,8 +6,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.bruce.common.controller.SysEnumController;
|
||||
import com.bruce.common.domain.entity.SysEnum;
|
||||
import com.bruce.common.domain.model.RequestResult;
|
||||
import com.bruce.common.dto.request.SysEnumBatchSaveRequest;
|
||||
import com.bruce.common.dto.request.SysEnumManageQueryRequest;
|
||||
import com.bruce.common.dto.request.SysEnumQueryRequest;
|
||||
import com.bruce.common.dto.request.SysEnumSaveRequest;
|
||||
import com.bruce.common.dto.response.SysEnumResponse;
|
||||
import com.bruce.common.mapper.SysEnumMapper;
|
||||
import com.bruce.common.service.ISysEnumService;
|
||||
import com.bruce.common.service.impl.SysEnumServiceImpl;
|
||||
@@ -45,20 +48,56 @@ class SysEnumComponentStructureTests {
|
||||
@Test
|
||||
void sysEnumShouldExposeSaveOrUpdateAndDeleteInterfaces() throws NoSuchMethodException {
|
||||
Method saveOrUpdateMethod = ISysEnumService.class.getMethod("saveOrUpdate", SysEnumSaveRequest.class);
|
||||
Method batchSaveMethod = ISysEnumService.class.getMethod("batchSave", SysEnumBatchSaveRequest.class);
|
||||
Method controllerSaveOrUpdateMethod = SysEnumController.class.getMethod("saveOrUpdate", SysEnumSaveRequest.class);
|
||||
Method controllerBatchSaveMethod = SysEnumController.class.getMethod("batchSave", SysEnumBatchSaveRequest.class);
|
||||
Method deleteMethod = SysEnumController.class.getMethod("deleteById", Long.class);
|
||||
Method listMethod = SysEnumController.class.getMethod("list");
|
||||
|
||||
assertNotNull(saveOrUpdateMethod);
|
||||
assertNotNull(batchSaveMethod);
|
||||
assertNotNull(controllerSaveOrUpdateMethod);
|
||||
assertNotNull(controllerBatchSaveMethod);
|
||||
assertNotNull(deleteMethod);
|
||||
assertNotNull(listMethod);
|
||||
assertEquals(boolean.class, saveOrUpdateMethod.getReturnType());
|
||||
assertEquals(boolean.class, batchSaveMethod.getReturnType());
|
||||
assertEquals(RequestResult.class, controllerSaveOrUpdateMethod.getReturnType());
|
||||
assertEquals(RequestResult.class, controllerBatchSaveMethod.getReturnType());
|
||||
assertEquals(RequestResult.class, deleteMethod.getReturnType());
|
||||
assertEquals(RequestResult.class, listMethod.getReturnType());
|
||||
}
|
||||
|
||||
@Test
|
||||
void sysEnumShouldExposeManagementQueryWithoutChangingCatalogTypeQuery() throws NoSuchMethodException {
|
||||
Method serviceMethod = ISysEnumService.class.getMethod("listForManagement", SysEnumManageQueryRequest.class);
|
||||
Method controllerMethod = SysEnumController.class.getMethod("queryForManagement", SysEnumManageQueryRequest.class);
|
||||
Method catalogTypeMethod = ISysEnumService.class.getMethod("listByCatalogAndType", SysEnumQueryRequest.class);
|
||||
|
||||
assertNotNull(serviceMethod);
|
||||
assertNotNull(controllerMethod);
|
||||
assertNotNull(catalogTypeMethod);
|
||||
assertEquals(List.class, serviceMethod.getReturnType());
|
||||
assertEquals(RequestResult.class, controllerMethod.getReturnType());
|
||||
assertEquals(List.class, catalogTypeMethod.getReturnType());
|
||||
assertTrue(serviceMethod.getGenericReturnType().getTypeName().contains("SysEnumResponse"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void sysEnumControllerShouldReturnDtoContracts() throws NoSuchMethodException {
|
||||
Method listMethod = SysEnumController.class.getMethod("list");
|
||||
Method manageQueryMethod = SysEnumController.class.getMethod("queryForManagement", SysEnumManageQueryRequest.class);
|
||||
Method detailMethod = SysEnumController.class.getMethod("getById", Long.class);
|
||||
Method serviceListMethod = ISysEnumService.class.getMethod("listResponses");
|
||||
Method responseFactory = SysEnumResponse.class.getMethod("fromEntity", SysEnum.class);
|
||||
|
||||
assertTrue(serviceListMethod.getGenericReturnType().getTypeName().contains("SysEnumResponse"));
|
||||
assertTrue(listMethod.getGenericReturnType().getTypeName().contains("SysEnumResponse"));
|
||||
assertTrue(manageQueryMethod.getGenericReturnType().getTypeName().contains("SysEnumResponse"));
|
||||
assertTrue(detailMethod.getGenericReturnType().getTypeName().contains("SysEnumResponse"));
|
||||
assertEquals(SysEnumResponse.class, responseFactory.getReturnType());
|
||||
}
|
||||
|
||||
@Test
|
||||
void sysEnumShouldProvideManualInitTestEntry() throws NoSuchMethodException {
|
||||
Method initMethod = SysEnumDataInitTests.class.getMethod("initDefaultEnums");
|
||||
|
||||
@@ -9,6 +9,8 @@ import com.bruce.rag.controller.RagDocumentController;
|
||||
import com.bruce.rag.controller.RagStoreController;
|
||||
import com.bruce.rag.dto.request.RagDocumentQueryRequest;
|
||||
import com.bruce.rag.dto.request.RagStoreQueryRequest;
|
||||
import com.bruce.rag.dto.response.RagDocumentResponse;
|
||||
import com.bruce.rag.dto.response.RagStoreResponse;
|
||||
import com.bruce.rag.entity.RagDocument;
|
||||
import com.bruce.rag.entity.RagStore;
|
||||
import com.bruce.rag.mapper.RagDocumentMapper;
|
||||
@@ -42,19 +44,31 @@ class RagComponentStructureTests {
|
||||
void ragControllersShouldExposeRequestResultAndQueryDtoMethods() throws NoSuchMethodException {
|
||||
Method storeListMethod = RagStoreController.class.getMethod("list");
|
||||
Method storeQueryMethod = RagStoreController.class.getMethod("query", RagStoreQueryRequest.class);
|
||||
Method storeResponseListMethod = IRagStoreService.class.getMethod("listResponses");
|
||||
Method storeServiceQueryMethod = IRagStoreService.class.getMethod("query", RagStoreQueryRequest.class);
|
||||
|
||||
Method documentListMethod = RagDocumentController.class.getMethod("list");
|
||||
Method documentQueryMethod = RagDocumentController.class.getMethod("query", RagDocumentQueryRequest.class);
|
||||
Method documentResponseListMethod = IRagDocumentService.class.getMethod("listResponses");
|
||||
Method documentServiceQueryMethod = IRagDocumentService.class.getMethod("query", RagDocumentQueryRequest.class);
|
||||
|
||||
assertEquals(RequestResult.class, storeListMethod.getReturnType());
|
||||
assertEquals(RequestResult.class, storeQueryMethod.getReturnType());
|
||||
assertEquals(List.class, storeServiceQueryMethod.getReturnType());
|
||||
assertTrue(storeResponseListMethod.getGenericReturnType().getTypeName().contains("RagStoreResponse"));
|
||||
assertTrue(storeServiceQueryMethod.getGenericReturnType().getTypeName().contains("RagStoreResponse"));
|
||||
assertTrue(storeListMethod.getGenericReturnType().getTypeName().contains("RagStoreResponse"));
|
||||
assertTrue(storeQueryMethod.getGenericReturnType().getTypeName().contains("RagStoreResponse"));
|
||||
assertEquals(RagStoreResponse.class, RagStoreResponse.class.getMethod("fromEntity", RagStore.class).getReturnType());
|
||||
|
||||
assertEquals(RequestResult.class, documentListMethod.getReturnType());
|
||||
assertEquals(RequestResult.class, documentQueryMethod.getReturnType());
|
||||
assertEquals(List.class, documentServiceQueryMethod.getReturnType());
|
||||
assertTrue(documentResponseListMethod.getGenericReturnType().getTypeName().contains("RagDocumentResponse"));
|
||||
assertTrue(documentServiceQueryMethod.getGenericReturnType().getTypeName().contains("RagDocumentResponse"));
|
||||
assertTrue(documentListMethod.getGenericReturnType().getTypeName().contains("RagDocumentResponse"));
|
||||
assertTrue(documentQueryMethod.getGenericReturnType().getTypeName().contains("RagDocumentResponse"));
|
||||
assertEquals(RagDocumentResponse.class, RagDocumentResponse.class.getMethod("fromEntity", RagDocument.class).getReturnType());
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user